diff --git a/bramble-api/build.gradle b/bramble-api/build.gradle index 8f864b574..0f68839ee 100644 --- a/bramble-api/build.gradle +++ b/bramble-api/build.gradle @@ -32,7 +32,7 @@ dependencyVerification { configurations { testOutput.extendsFrom(testCompile) } -task jarTest (type: Jar, dependsOn: testClasses) { +task jarTest(type: Jar, dependsOn: testClasses) { from sourceSets.test.output classifier = 'test' } diff --git a/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfDictionaryTest.java b/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfDictionaryTest.java index 9a06c0e49..17bb65116 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfDictionaryTest.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfDictionaryTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.Bytes; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.util.Collections; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfListTest.java b/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfListTest.java index 76ad50567..55fbf39db 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfListTest.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/api/data/BdfListTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.api.data; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.FormatException; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.util.Arrays; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/BrambleMockTestCase.java b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleMockTestCase.java similarity index 86% rename from bramble-api/src/test/java/org/briarproject/bramble/BrambleMockTestCase.java rename to bramble-api/src/test/java/org/briarproject/bramble/test/BrambleMockTestCase.java index b43003e13..650063c04 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/BrambleMockTestCase.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleMockTestCase.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.jmock.Mockery; import org.junit.After; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/BrambleTestCase.java b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java similarity index 92% rename from bramble-api/src/test/java/org/briarproject/bramble/BrambleTestCase.java rename to bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java index 968c6099f..aa0eb55e5 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/BrambleTestCase.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import java.lang.Thread.UncaughtExceptionHandler; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/TestUtils.java b/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java similarity index 96% rename from bramble-api/src/test/java/org/briarproject/bramble/TestUtils.java rename to bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java index bfdab2fe9..9e8a1df9a 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/TestUtils.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.crypto.SecretKey; diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle index 9c2ecbc3c..ffc432b28 100644 --- a/bramble-core/build.gradle +++ b/bramble-core/build.gradle @@ -28,7 +28,7 @@ dependencyVerification { configurations { testOutput.extendsFrom(testCompile) } -task jarTest (type: Jar, dependsOn: testClasses) { +task jarTest(type: Jar, dependsOn: testClasses) { from sourceSets.test.output classifier = 'test' } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java b/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java index 99b3b8b27..58afef572 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.client; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.BdfMessageContext; import org.briarproject.bramble.api.client.BdfMessageValidator; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageContext; +import org.briarproject.bramble.test.ValidatorTestCase; import org.jmock.Expectations; import org.jmock.lib.legacy.ClassImposteriser; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java index 3f4ff4e30..d0def2ad4 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.client; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.crypto.CryptoComponent; @@ -21,6 +19,8 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; @@ -32,8 +32,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java index 983ab2c00..1c4f29073 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.contact; -import org.briarproject.bramble.BrambleMockTestCase; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -11,6 +10,7 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.transport.KeyManager; +import org.briarproject.bramble.test.BrambleMockTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.bramble.TestUtils.getSecretKey; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getSecretKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/AsciiArmourTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/AsciiArmourTest.java index 61e3a0ad3..7d1f045c2 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/AsciiArmourTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/AsciiArmourTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/Blake2sDigestTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/Blake2sDigestTest.java index 6cb64e398..da0e7d5da 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/Blake2sDigestTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/Blake2sDigestTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.util.StringUtils; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurveMultiplicationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurveMultiplicationTest.java index ac55112dd..ce3d03e44 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurveMultiplicationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurveMultiplicationTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves; import org.spongycastle.asn1.x9.X9ECParameters; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaGeneratorTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaGeneratorTest.java index b7c84534b..c1573f610 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaGeneratorTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaGeneratorTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import org.spongycastle.crypto.BlockCipher; import org.spongycastle.crypto.engines.AESLightEngine; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaSecureRandomTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaSecureRandomTest.java index ed8d00eee..d685ce11f 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaSecureRandomTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaSecureRandomTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import org.spongycastle.crypto.BlockCipher; import org.spongycastle.crypto.digests.SHA256Digest; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java index 31d24411d..0a0e826dc 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java @@ -1,11 +1,11 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.system.SeedProvider; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java index 607c99ab8..616833c47 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.util.ArrayList; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyEncodingAndParsingTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyEncodingAndParsingTest.java index 30e2a803e..3a6f011f8 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyEncodingAndParsingTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyEncodingAndParsingTest.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.KeyParser; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.security.GeneralSecurityException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/MacTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/MacTest.java index 54b4ac9aa..3699e601e 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/MacTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/MacTest.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.util.Arrays; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/MessageEncrypterTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/MessageEncrypterTest.java index 6123b1403..8b15e222a 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/MessageEncrypterTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/MessageEncrypterTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import org.spongycastle.crypto.CryptoException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordBasedKdfTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordBasedKdfTest.java index c58d39ba8..f92b0fef6 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordBasedKdfTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordBasedKdfTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; -import org.briarproject.bramble.TestUtils; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.util.Random; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImplTest.java index 0b8626289..28f7e4bd2 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_STRONG; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/SignatureTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/SignatureTest.java index b2d64aad1..017ba3a3b 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/SignatureTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/SignatureTest.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestSeedProvider; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.KeyPair; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestSeedProvider; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.util.Arrays; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamDecrypterImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamDecrypterImplTest.java index f3cefc136..0a6a5f4c0 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamDecrypterImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamDecrypterImplTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.SecretKey; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.ByteUtils; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamEncrypterImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamEncrypterImplTest.java index d0d9fd3a4..8ed35336d 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamEncrypterImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/StreamEncrypterImplTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.SecretKey; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.io.ByteArrayOutputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java index 6dbfa85b3..9ddcc9487 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/XSalsa20Poly1305AuthenticatedCipherTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.crypto; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.crypto.SecretKey; +import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.util.StringUtils; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/data/BdfReaderImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/data/BdfReaderImplTest.java index df658a551..f8e5fc070 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/data/BdfReaderImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/data/BdfReaderImplTest.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.data; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.StringUtils; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java index 478a047e7..c480c91c6 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.data; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java index 9d43ae8e5..7fbdcb18d 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.data; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.db.Metadata; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java index 85de68c80..da5d7aecf 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java index 62d0f8367..7c46cc6e5 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.event.ContactAddedEvent; @@ -49,6 +47,8 @@ import org.briarproject.bramble.api.sync.event.MessagesSentEvent; import org.briarproject.bramble.api.transport.IncomingKeys; import org.briarproject.bramble.api.transport.OutgoingKeys; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/ExponentialBackoffTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/ExponentialBackoffTest.java index e60cb5b43..6d1de7e36 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/ExponentialBackoffTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/ExponentialBackoffTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java index adffded9f..3552beac7 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.crypto.SecretKey; @@ -23,7 +21,9 @@ import org.briarproject.bramble.api.transport.IncomingKeys; import org.briarproject.bramble.api.transport.OutgoingKeys; import org.briarproject.bramble.api.transport.TransportKeys; import org.briarproject.bramble.system.SystemClock; -import org.briarproject.bramble.TestDatabaseConfig; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestDatabaseConfig; +import org.briarproject.bramble.test.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java index 3d4ff414a..5b0d37610 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/TransactionIsolationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/TransactionIsolationTest.java index 4226f2af5..6596861cc 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/TransactionIsolationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/TransactionIsolationTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.db; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java index 35e8ffa70..fee5bc9fc 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.identity; -import org.briarproject.bramble.BrambleMockTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; @@ -11,6 +9,8 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; +import org.briarproject.bramble.test.BrambleMockTestCase; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java b/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java index 0eab6958c..25cff4778 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java @@ -1,13 +1,13 @@ package org.briarproject.bramble.keyagreement; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.KeyPair; import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.keyagreement.Payload; import org.briarproject.bramble.api.keyagreement.PayloadEncoder; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.jmock.auto.Mock; import org.jmock.integration.junit4.JUnitRuleMockery; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java index 9249bb4be..f4fc1ed70 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.lifecycle; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.lifecycle.ShutdownManager; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.util.HashSet; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/BackoffImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/BackoffImplTest.java index d356b86aa..09bf49726 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/BackoffImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/BackoffImplTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java index 9bc189597..dba85a6b2 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.plugin.ConnectionRegistry; @@ -9,6 +8,7 @@ import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java index f4c6e650d..23a40ed20 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.PluginConfig; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.ui.UiCallback; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.concurrent.Synchroniser; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerTest.java index 15c48fb14..89afcdf85 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerTest.java @@ -1,8 +1,5 @@ package org.briarproject.bramble.plugin; -import org.briarproject.bramble.RunAction; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.ImmediateExecutor; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.event.ContactStatusChangedEvent; import org.briarproject.bramble.api.plugin.ConnectionManager; @@ -18,6 +15,9 @@ import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent; import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.ImmediateExecutor; +import org.briarproject.bramble.test.RunAction; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java index 401d0da61..a873ee829 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.plugin.tcp; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection; @@ -12,6 +11,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.settings.Settings; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.io.IOException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java index 9271772d5..3cf98a8c0 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.properties; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyValidatorTest.java b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyValidatorTest.java index 267d962e6..7d48fa75d 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyValidatorTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyValidatorTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.properties; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; @@ -14,6 +12,8 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/PacketReaderImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/PacketReaderImplTest.java index 1f380e77d..3d6849429 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/PacketReaderImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/PacketReaderImplTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UniqueId; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.ByteUtils; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java index 6dc90f0fd..2304b4053 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java @@ -1,8 +1,5 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.ImmediateExecutor; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.Transaction; @@ -10,6 +7,9 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.sync.Ack; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.PacketWriter; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.ImmediateExecutor; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java index ceb514430..3d8959909 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java @@ -1,7 +1,5 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; @@ -22,6 +20,8 @@ import org.briarproject.bramble.api.sync.Request; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java index 67155b40c..6c0ffa19c 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.TestSeedProviderModule; import org.briarproject.bramble.crypto.CryptoModule; +import org.briarproject.bramble.test.TestSeedProviderModule; import org.briarproject.bramble.transport.TransportModule; import javax.inject.Singleton; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java index a7cb067c6..b99c2f062 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java @@ -1,8 +1,5 @@ package org.briarproject.bramble.sync; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.ImmediateExecutor; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseComponent; @@ -22,6 +19,9 @@ import org.briarproject.bramble.api.sync.ValidationManager.IncomingMessageHook; import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator; import org.briarproject.bramble.api.sync.ValidationManager.State; import org.briarproject.bramble.api.sync.event.MessageAddedEvent; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.ImmediateExecutor; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.ByteUtils; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSeedProviderTest.java b/bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSeedProviderTest.java index b4db19bad..0e0fe119c 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSeedProviderTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSeedProviderTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.system; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.Bytes; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.OsUtils; import org.junit.After; import org.junit.Before; diff --git a/briar-core/src/test/java/org/briarproject/briar/CaptureArgumentAction.java b/bramble-core/src/test/java/org/briarproject/bramble/test/CaptureArgumentAction.java similarity index 95% rename from briar-core/src/test/java/org/briarproject/briar/CaptureArgumentAction.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/CaptureArgumentAction.java index 34a5788fc..b0463eab3 100644 --- a/briar-core/src/test/java/org/briarproject/briar/CaptureArgumentAction.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/CaptureArgumentAction.java @@ -1,4 +1,4 @@ -package org.briarproject.briar; +package org.briarproject.bramble.test; import org.hamcrest.Description; import org.jmock.api.Action; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/ImmediateExecutor.java b/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java similarity index 86% rename from bramble-api/src/test/java/org/briarproject/bramble/ImmediateExecutor.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java index 65ae6d141..7d488ecc7 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/ImmediateExecutor.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/ImmediateExecutor.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/RunAction.java b/bramble-core/src/test/java/org/briarproject/bramble/test/RunAction.java similarity index 91% rename from bramble-core/src/test/java/org/briarproject/bramble/RunAction.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/RunAction.java index 7ed4ca771..0ec8d7ac8 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/RunAction.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/RunAction.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.hamcrest.Description; import org.jmock.api.Action; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseConfig.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java similarity index 96% rename from bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseConfig.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java index 3ed6fd70b..d6ee0325f 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseConfig.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseConfig.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseConfig; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java similarity index 94% rename from bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java index f3360471d..e4f2f5585 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/TestDatabaseModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDatabaseModule.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DatabaseExecutor; diff --git a/briar-core/src/test/java/org/briarproject/briar/TestLifecycleModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java similarity index 97% rename from briar-core/src/test/java/org/briarproject/briar/TestLifecycleModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java index 7344aaf4b..ee8d5115e 100644 --- a/briar-core/src/test/java/org/briarproject/briar/TestLifecycleModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestLifecycleModule.java @@ -1,4 +1,4 @@ -package org.briarproject.briar; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; diff --git a/briar-core/src/test/java/org/briarproject/briar/TestPluginConfigModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java similarity index 97% rename from briar-core/src/test/java/org/briarproject/briar/TestPluginConfigModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java index ae5a4a2e3..5709770b5 100644 --- a/briar-core/src/test/java/org/briarproject/briar/TestPluginConfigModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestPluginConfigModule.java @@ -1,4 +1,4 @@ -package org.briarproject.briar; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.PluginConfig; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/TestSeedProvider.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProvider.java similarity index 87% rename from bramble-api/src/test/java/org/briarproject/bramble/TestSeedProvider.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProvider.java index 911ca2f51..a149bec8b 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/TestSeedProvider.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProvider.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.system.SeedProvider; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/TestSeedProviderModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProviderModule.java similarity index 87% rename from bramble-api/src/test/java/org/briarproject/bramble/TestSeedProviderModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProviderModule.java index eb5ccff38..ce8650d26 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/TestSeedProviderModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestSeedProviderModule.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.system.SeedProvider; diff --git a/bramble-api/src/test/java/org/briarproject/bramble/ValidatorTestCase.java b/bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java similarity index 97% rename from bramble-api/src/test/java/org/briarproject/bramble/ValidatorTestCase.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java index 815451f3f..07afb2e58 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/ValidatorTestCase.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java @@ -1,4 +1,4 @@ -package org.briarproject.bramble; +package org.briarproject.bramble.test; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.MetadataEncoder; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java index d4eed7a53..340dfb146 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java @@ -1,6 +1,5 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.event.ContactRemovedEvent; @@ -14,6 +13,7 @@ import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; import org.briarproject.bramble.api.transport.StreamContext; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.concurrent.DeterministicExecutor; @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.bramble.TestUtils.getSecretKey; import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getSecretKey; import static org.junit.Assert.assertEquals; public class KeyManagerImplTest extends BrambleTestCase { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/ReorderingWindowTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/ReorderingWindowTest.java index 83b24340f..503158357 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/ReorderingWindowTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/ReorderingWindowTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.transport.ReorderingWindow.Change; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java index 642398831..40ff07631 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.crypto.StreamDecrypter; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderWriterIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderWriterIntegrationTest.java index 85214cacb..e8bdcc035 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderWriterIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderWriterIntegrationTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.crypto.StreamDecrypter; import org.briarproject.bramble.api.crypto.StreamEncrypter; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java index c7d7a16d6..b0db082ba 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.crypto.StreamEncrypter; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java index 6bce11a83..5962afcf5 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java @@ -1,8 +1,5 @@ package org.briarproject.bramble.transport; -import org.briarproject.bramble.RunAction; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.SecretKey; @@ -14,6 +11,9 @@ import org.briarproject.bramble.api.transport.IncomingKeys; import org.briarproject.bramble.api.transport.OutgoingKeys; import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.TransportKeys; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.RunAction; +import org.briarproject.bramble.test.TestUtils; import org.hamcrest.Description; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java b/bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java index a4fda13b8..eef6c0b68 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.briarproject.bramble.util.ByteUtils.MAX_16_BIT_UNSIGNED; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/util/StringUtilsTest.java b/bramble-core/src/test/java/org/briarproject/bramble/util/StringUtilsTest.java index 140d654a4..f7042027d 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/util/StringUtilsTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/util/StringUtilsTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.util; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/LinuxRemovableDriveFinderTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/LinuxRemovableDriveFinderTest.java index 26afffe3b..b26bc77a8 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/LinuxRemovableDriveFinderTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/LinuxRemovableDriveFinderTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/MacRemovableDriveFinderTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/MacRemovableDriveFinderTest.java index fbbddca40..db2cf2100 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/MacRemovableDriveFinderTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/MacRemovableDriveFinderTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java index a58fc2a53..9d8db1b84 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java @@ -1,8 +1,8 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.plugin.file.RemovableDriveMonitor.Callback; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import java.io.File; @@ -41,7 +41,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase { }; // Create a callback that waits for two files final CountDownLatch latch = new CountDownLatch(2); - final List detected = new ArrayList(); + final List detected = new ArrayList<>(); @NotNullByDefault Callback callback = new Callback() { diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java index d803b0a50..101c74cf7 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.ImmediateExecutor; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginCallback; import org.briarproject.bramble.plugin.file.RemovableDriveMonitor.Callback; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.ImmediateExecutor; +import org.briarproject.bramble.test.TestUtils; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -73,7 +73,7 @@ public class RemovableDrivePluginTest extends BrambleTestCase { public void testWriterIsNullIfNoDriveIsChosen() throws Exception { final File drive1 = new File(testDir, "1"); final File drive2 = new File(testDir, "2"); - final List drives = new ArrayList(); + final List drives = new ArrayList<>(); drives.add(drive1); drives.add(drive2); @@ -112,7 +112,7 @@ public class RemovableDrivePluginTest extends BrambleTestCase { public void testWriterIsNullIfOutputDirDoesNotExist() throws Exception { final File drive1 = new File(testDir, "1"); final File drive2 = new File(testDir, "2"); - final List drives = new ArrayList(); + final List drives = new ArrayList<>(); drives.add(drive1); drives.add(drive2); @@ -151,7 +151,7 @@ public class RemovableDrivePluginTest extends BrambleTestCase { public void testWriterIsNullIfOutputDirIsAFile() throws Exception { final File drive1 = new File(testDir, "1"); final File drive2 = new File(testDir, "2"); - final List drives = new ArrayList(); + final List drives = new ArrayList<>(); drives.add(drive1); drives.add(drive2); // Create drive1 as a file rather than a directory @@ -192,7 +192,7 @@ public class RemovableDrivePluginTest extends BrambleTestCase { public void testWriterIsNotNullIfOutputDirIsADir() throws Exception { final File drive1 = new File(testDir, "1"); final File drive2 = new File(testDir, "2"); - final List drives = new ArrayList(); + final List drives = new ArrayList<>(); drives.add(drive1); drives.add(drive2); // Create drive1 as a directory @@ -236,7 +236,7 @@ public class RemovableDrivePluginTest extends BrambleTestCase { public void testWritingToWriter() throws Exception { final File drive1 = new File(testDir, "1"); final File drive2 = new File(testDir, "2"); - final List drives = new ArrayList(); + final List drives = new ArrayList<>(); drives.add(drive1); drives.add(drive2); // Create drive1 as a directory diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java index 83d26f1df..0a43ba153 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.file; -import org.briarproject.bramble.BrambleTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.plugin.file.RemovableDriveMonitor.Callback; +import org.briarproject.bramble.test.BrambleTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.OsUtils; import org.junit.After; import org.junit.Before; @@ -61,7 +61,7 @@ public class UnixRemovableDriveMonitorTest extends BrambleTestCase { return; } // Create a callback that will wait for two files before stopping - final List detected = new ArrayList(); + final List detected = new ArrayList<>(); final CountDownLatch latch = new CountDownLatch(2); @NotNullByDefault final Callback callback = new Callback() { diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java index 02b045699..0f560b089 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java @@ -1,6 +1,6 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.BrambleTestCase; +import org.briarproject.bramble.test.BrambleTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java index 64df9fce6..c516acb17 100644 --- a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java +++ b/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.plugin.modem; -import org.briarproject.bramble.BrambleTestCase; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback; import org.briarproject.bramble.api.properties.TransportProperties; +import org.briarproject.bramble.test.BrambleTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java index e67450474..69eccd479 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogController.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.blog; import android.support.annotation.UiThread; -import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java index 2f219ea86..2655c7ff3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostFragment.java @@ -2,9 +2,6 @@ package org.briarproject.briar.android.blog; import android.os.Bundle; import android.support.annotation.UiThread; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -13,7 +10,6 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; -import javax.annotation.Nullable; import javax.inject.Inject; @UiThread diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java index 81d9ce794..b04834b41 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java @@ -4,7 +4,6 @@ import android.support.annotation.UiThread; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.DestroyableContext; import java.util.Collection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java index 700beee63..c41df9f23 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java @@ -1,7 +1,6 @@ package org.briarproject.briar.android.controller; import android.support.annotation.Nullable; -import android.support.annotation.UiThread; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java index 694d78927..decf81f76 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java @@ -35,7 +35,7 @@ public class SetupActivity extends BaseActivity implements OnClickListener, OnEditorActionListener { @Inject - protected SetupController setupController; + SetupController setupController; private TextInputLayout nicknameEntryWrapper; private TextInputLayout passwordEntryWrapper; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java index e9edf9e83..057da939e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ForumSharingStatusActivity.java @@ -9,7 +9,6 @@ import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.api.forum.ForumSharingManager; import java.util.Collection; -import java.util.HashSet; import javax.inject.Inject; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java index 2d0c4f0af..5258a3210 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.briar.R; import org.briarproject.briar.android.contactselection.ContactSelectorActivity; import org.briarproject.briar.android.sharing.BaseMessageFragment.MessageFragmentListener; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/TestSetupActivity.java b/briar-android/src/test/java/org/briarproject/briar/android/TestSetupActivity.java deleted file mode 100644 index d9c78c800..000000000 --- a/briar-android/src/test/java/org/briarproject/briar/android/TestSetupActivity.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.briarproject.briar.android; - -import org.briarproject.briar.android.login.SetupActivity; -import org.briarproject.briar.android.login.SetupController; - -/** - * This class exposes the SetupController and offers the possibility to - * override it. - */ -public class TestSetupActivity extends SetupActivity { - - public SetupController getController() { - return setupController; - } - - public void setController(SetupController setupController) { - this.setupController = setupController; - } -} diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java index 11810fb1c..5773f0d2a 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java @@ -4,11 +4,11 @@ import android.content.Intent; import junit.framework.Assert; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/SetupActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java similarity index 98% rename from briar-android/src/test/java/org/briarproject/briar/android/SetupActivityTest.java rename to briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java index d6c445eb8..86472493c 100644 --- a/briar-android/src/test/java/org/briarproject/briar/android/SetupActivityTest.java +++ b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.android; +package org.briarproject.briar.android.login; import android.content.Context; import android.content.Intent; @@ -12,9 +12,8 @@ import com.google.common.base.Strings; import org.briarproject.bramble.api.identity.AuthorConstants; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.R; +import org.briarproject.briar.android.TestBriarApplication; import org.briarproject.briar.android.controller.handler.ResultHandler; -import org.briarproject.briar.android.login.SetupController; -import org.briarproject.briar.android.login.StrengthMeter; import org.briarproject.briar.android.navdrawer.NavDrawerActivity; import org.junit.Assert; import org.junit.Before; diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/TestSetupActivity.java b/briar-android/src/test/java/org/briarproject/briar/android/login/TestSetupActivity.java new file mode 100644 index 000000000..0595329be --- /dev/null +++ b/briar-android/src/test/java/org/briarproject/briar/android/login/TestSetupActivity.java @@ -0,0 +1,16 @@ +package org.briarproject.briar.android.login; + +/** + * This class exposes the SetupController and offers the possibility to + * override it. + */ +public class TestSetupActivity extends SetupActivity { + + SetupController getController() { + return setupController; + } + + void setController(SetupController setupController) { + this.setupController = setupController; + } +} diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 74691734c..0f8177975 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -16,8 +16,8 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.3.1' compile 'org.jsoup:jsoup:1.9.2' - testCompile project(':bramble-core') // TODO get rid of this dependency - + testCompile project(':bramble-core') + testCompile project(path: ':bramble-core', configuration: 'testOutput') testCompile project(path: ':bramble-api', configuration: 'testOutput') testCompile 'net.jodah:concurrentunit:0.4.2' } diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeEngine.java index f93fb0aa4..74ecc946a 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeEngine.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeEngine.java @@ -17,7 +17,6 @@ import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.logging.Logger; @@ -43,7 +42,6 @@ import static org.briarproject.briar.api.introduction.IntroductionConstants.CONT import static org.briarproject.briar.api.introduction.IntroductionConstants.EXISTS; import static org.briarproject.briar.api.introduction.IntroductionConstants.E_PUBLIC_KEY; import static org.briarproject.briar.api.introduction.IntroductionConstants.GROUP_ID; -import static org.briarproject.briar.api.introduction.IntroductionConstants.INTRODUCER; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAC; import static org.briarproject.briar.api.introduction.IntroductionConstants.MESSAGE_ID; import static org.briarproject.briar.api.introduction.IntroductionConstants.MESSAGE_TIME; diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java index 44ba74960..c96d0df9f 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java @@ -37,9 +37,9 @@ import org.briarproject.briar.api.sharing.InvitationMessage; import org.briarproject.briar.api.sharing.Shareable; import org.briarproject.briar.api.sharing.SharingInvitationItem; import org.briarproject.briar.api.sharing.SharingManager; +import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; import org.briarproject.briar.api.sharing.event.InvitationRequestReceivedEvent; import org.briarproject.briar.api.sharing.event.InvitationResponseReceivedEvent; -import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent; import org.briarproject.briar.client.ConversationClientImpl; import java.io.IOException; diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java index ee2a27522..e2b5e8ef5 100644 --- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java @@ -1,6 +1,5 @@ package org.briarproject.briar.blog; -import org.briarproject.briar.BriarTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.Contact; @@ -27,6 +26,7 @@ import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; import org.briarproject.briar.api.blog.BlogPostHeader; import org.briarproject.briar.api.blog.event.BlogPostAddedEvent; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; @@ -34,11 +34,11 @@ import org.junit.Test; import java.util.Collection; import java.util.Collections; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.api.blog.BlogConstants.KEY_AUTHOR; import static org.briarproject.briar.api.blog.BlogConstants.KEY_AUTHOR_ID; import static org.briarproject.briar.api.blog.BlogConstants.KEY_AUTHOR_NAME; diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java index 8feaeaa4e..7c7a68180 100644 --- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerIntegrationTest.java @@ -1,16 +1,16 @@ package org.briarproject.briar.blog; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogCommentHeader; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostHeader; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -21,7 +21,7 @@ import java.util.Iterator; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; -import static org.briarproject.bramble.TestUtils.getRandomString; +import static org.briarproject.bramble.test.TestUtils.getRandomString; import static org.briarproject.briar.api.blog.MessageType.COMMENT; import static org.briarproject.briar.api.blog.MessageType.POST; import static org.briarproject.briar.api.blog.MessageType.WRAPPED_COMMENT; diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogPostValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogPostValidatorTest.java index 8bc1c865c..1ac77a550 100644 --- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogPostValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogPostValidatorTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.blog; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; @@ -19,8 +17,10 @@ import org.briarproject.bramble.api.sync.MessageFactory; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.system.SystemClock; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogFactory; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/client/MessageQueueManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/client/MessageQueueManagerImplTest.java index 039816361..19878e4ad 100644 --- a/briar-core/src/test/java/org/briarproject/briar/client/MessageQueueManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/client/MessageQueueManagerImplTest.java @@ -1,8 +1,5 @@ package org.briarproject.briar.client; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.briar.CaptureArgumentAction; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; @@ -19,11 +16,14 @@ import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.ValidationManager; import org.briarproject.bramble.api.sync.ValidationManager.IncomingMessageHook; import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator; +import org.briarproject.bramble.test.CaptureArgumentAction; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.ByteUtils; import org.briarproject.briar.api.client.MessageQueueManager.IncomingQueueMessageHook; import org.briarproject.briar.api.client.MessageQueueManager.QueueMessageValidator; import org.briarproject.briar.api.client.QueueMessage; import org.briarproject.briar.api.client.QueueMessageFactory; +import org.briarproject.briar.test.BriarTestCase; import org.hamcrest.Description; import org.jmock.Expectations; import org.jmock.Mockery; diff --git a/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java b/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java index 87c8f5a54..b1a457c8a 100644 --- a/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/client/MessageTreeImplTest.java @@ -1,8 +1,8 @@ package org.briarproject.briar.client; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageTree; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerImplTest.java index f8a5b8354..084da117f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerImplTest.java @@ -1,6 +1,6 @@ package org.briarproject.briar.forum; -import org.briarproject.briar.BriarTestCase; +import org.briarproject.briar.test.BriarTestCase; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java index f8a0f119d..9ca8805f2 100644 --- a/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/forum/ForumManagerTest.java @@ -1,15 +1,15 @@ package org.briarproject.briar.forum; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.forum.Forum; import org.briarproject.briar.api.forum.ForumManager; import org.briarproject.briar.api.forum.ForumPost; import org.briarproject.briar.api.forum.ForumPostHeader; import org.briarproject.briar.api.forum.ForumSharingManager; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Test; @@ -17,7 +17,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import static org.briarproject.briar.BriarTestUtils.assertGroupCount; +import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/briar-core/src/test/java/org/briarproject/briar/forum/ForumPostValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/forum/ForumPostValidatorTest.java index 0fe575884..d61a16d12 100644 --- a/briar-core/src/test/java/org/briarproject/briar/forum/ForumPostValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/forum/ForumPostValidatorTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.forum; -import org.briarproject.bramble.TestUtils; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.client.BdfMessageContext; @@ -11,6 +9,8 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.TestUtils; +import org.briarproject.bramble.test.ValidatorTestCase; import org.jmock.Expectations; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroduceeManagerTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroduceeManagerTest.java index b424040ec..30b58d587 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroduceeManagerTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroduceeManagerTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; @@ -27,8 +25,10 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.introduction.IntroduceeProtocolState; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroducerManagerTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroducerManagerTest.java index 1861eeef5..1eb26692f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroducerManagerTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroducerManagerTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; @@ -20,6 +18,8 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.TestUtils; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index 8141dd0f4..06ff73e68 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -2,8 +2,6 @@ package org.briarproject.briar.introduction; import net.jodah.concurrentunit.Waiter; -import org.briarproject.bramble.TestDatabaseModule; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.Contact; @@ -26,7 +24,8 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.BriarIntegrationTest; +import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.introduction.IntroductionManager; import org.briarproject.briar.api.introduction.IntroductionMessage; @@ -35,6 +34,7 @@ import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent; import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent; import org.briarproject.briar.api.introduction.event.IntroductionResponseReceivedEvent; import org.briarproject.briar.api.introduction.event.IntroductionSucceededEvent; +import org.briarproject.briar.test.BriarIntegrationTest; import org.junit.Before; import org.junit.Test; @@ -51,9 +51,8 @@ import java.util.logging.Logger; import javax.inject.Inject; -import static org.briarproject.briar.TestPluginConfigModule.TRANSPORT_ID; -import static org.briarproject.briar.BriarTestUtils.assertGroupCount; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; +import static org.briarproject.bramble.test.TestPluginConfigModule.TRANSPORT_ID; import static org.briarproject.briar.api.client.MessageQueueManager.QUEUE_STATE_KEY; import static org.briarproject.briar.api.introduction.IntroductionConstants.E_PUBLIC_KEY; import static org.briarproject.briar.api.introduction.IntroductionConstants.GROUP_ID; @@ -70,6 +69,7 @@ import static org.briarproject.briar.api.introduction.IntroductionConstants.TYPE import static org.briarproject.briar.api.introduction.IntroductionConstants.TYPE_REQUEST; import static org.briarproject.briar.api.introduction.IntroductionConstants.TYPE_RESPONSE; import static org.briarproject.briar.introduction.IntroduceeManager.SIGNING_LABEL_RESPONSE; +import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java index 7528bd1a3..538d4def3 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java @@ -1,8 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.bramble.TestDatabaseModule; -import org.briarproject.briar.TestPluginConfigModule; -import org.briarproject.bramble.TestSeedProviderModule; import org.briarproject.bramble.client.ClientModule; import org.briarproject.bramble.contact.ContactModule; import org.briarproject.bramble.crypto.CryptoModule; @@ -14,8 +11,10 @@ import org.briarproject.bramble.lifecycle.LifecycleModule; import org.briarproject.bramble.properties.PropertiesModule; import org.briarproject.bramble.sync.SyncModule; import org.briarproject.bramble.system.SystemModule; +import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestPluginConfigModule; +import org.briarproject.bramble.test.TestSeedProviderModule; import org.briarproject.bramble.transport.TransportModule; -import org.briarproject.briar.BriarIntegrationTestComponent; import org.briarproject.briar.blog.BlogModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.forum.ForumModule; @@ -23,6 +22,7 @@ import org.briarproject.briar.messaging.MessagingModule; import org.briarproject.briar.privategroup.PrivateGroupModule; import org.briarproject.briar.privategroup.invitation.GroupInvitationModule; import org.briarproject.briar.sharing.SharingModule; +import org.briarproject.briar.test.BriarIntegrationTestComponent; import javax.inject.Singleton; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionManagerImplTest.java index 04566982f..20673e7a5 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionManagerImplTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.Contact; @@ -21,8 +19,10 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageStatus; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionValidatorTest.java index 5ea72f4d3..fd7615109 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionValidatorTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; @@ -16,7 +14,9 @@ import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.system.SystemClock; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Mockery; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/MessageSenderTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/MessageSenderTest.java index 194d24eff..2cfe9e712 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/MessageSenderTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/MessageSenderTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.introduction; -import org.briarproject.briar.BriarTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.data.BdfDictionary; @@ -16,8 +14,10 @@ import org.briarproject.bramble.api.sync.ClientId; import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageQueueManager; import org.briarproject.briar.api.client.SessionId; +import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java index b7d522f39..79197bf43 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java @@ -1,6 +1,5 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.PrivateKey; @@ -9,21 +8,22 @@ import org.briarproject.bramble.api.identity.LocalAuthor; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.system.SystemModule; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.StringUtils; -import org.briarproject.briar.BriarTestCase; import org.briarproject.briar.api.forum.ForumConstants; import org.briarproject.briar.api.forum.ForumPost; import org.briarproject.briar.api.forum.ForumPostFactory; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; +import org.briarproject.briar.test.BriarTestCase; import org.junit.Test; import javax.inject.Inject; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.sync.SyncConstants.MAX_PACKET_PAYLOAD_LENGTH; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_BODY_LENGTH; import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH; import static org.junit.Assert.assertTrue; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java index 3019c0aca..2c91a0bd8 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java @@ -1,8 +1,5 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.TestDatabaseModule; -import org.briarproject.briar.TestLifecycleModule; -import org.briarproject.bramble.TestSeedProviderModule; import org.briarproject.bramble.client.ClientModule; import org.briarproject.bramble.crypto.CryptoModule; import org.briarproject.bramble.data.DataModule; @@ -11,6 +8,9 @@ import org.briarproject.bramble.event.EventModule; import org.briarproject.bramble.identity.IdentityModule; import org.briarproject.bramble.sync.SyncModule; import org.briarproject.bramble.system.SystemModule; +import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestLifecycleModule; +import org.briarproject.bramble.test.TestSeedProviderModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.forum.ForumModule; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerImplTest.java index 4aaf3e8ed..a9d3043d8 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerImplTest.java @@ -1,6 +1,6 @@ package org.briarproject.briar.messaging; -import org.briarproject.briar.BriarTestCase; +import org.briarproject.briar.test.BriarTestCase; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java index cb9c2af07..ef776d726 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/PrivateMessageValidatorTest.java @@ -1,11 +1,11 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.TestUtils; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.BdfMessageContext; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; +import org.briarproject.bramble.test.TestUtils; +import org.briarproject.bramble.test.ValidatorTestCase; import org.junit.Test; import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java index 023ec5c2a..b12b951cf 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.TestDatabaseModule; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.crypto.SecretKey; @@ -22,10 +20,12 @@ import org.briarproject.bramble.api.transport.StreamContext; import org.briarproject.bramble.api.transport.StreamReaderFactory; import org.briarproject.bramble.api.transport.StreamWriterFactory; import org.briarproject.bramble.system.SystemModule; -import org.briarproject.briar.BriarTestCase; +import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessage; import org.briarproject.briar.api.messaging.PrivateMessageFactory; +import org.briarproject.briar.test.BriarTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,8 +38,8 @@ import java.io.OutputStream; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH; -import static org.briarproject.briar.TestPluginConfigModule.MAX_LATENCY; -import static org.briarproject.briar.TestPluginConfigModule.TRANSPORT_ID; +import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY; +import static org.briarproject.bramble.test.TestPluginConfigModule.TRANSPORT_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java index a45931652..085d28ae1 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java @@ -1,8 +1,5 @@ package org.briarproject.briar.messaging; -import org.briarproject.bramble.TestDatabaseModule; -import org.briarproject.briar.TestPluginConfigModule; -import org.briarproject.bramble.TestSeedProviderModule; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; @@ -21,6 +18,9 @@ import org.briarproject.bramble.identity.IdentityModule; import org.briarproject.bramble.lifecycle.LifecycleModule; import org.briarproject.bramble.sync.SyncModule; import org.briarproject.bramble.system.SystemModule; +import org.briarproject.bramble.test.TestDatabaseModule; +import org.briarproject.bramble.test.TestPluginConfigModule; +import org.briarproject.bramble.test.TestSeedProviderModule; import org.briarproject.bramble.transport.TransportModule; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageFactory; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupInvitationIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupInvitationIntegrationTest.java index 92addf7a9..83eb59003 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupInvitationIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupInvitationIntegrationTest.java @@ -1,11 +1,8 @@ package org.briarproject.briar.privategroup; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.sync.Group; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.client.ProtocolStateException; import org.briarproject.briar.api.privategroup.GroupMessage; import org.briarproject.briar.api.privategroup.PrivateGroup; @@ -15,6 +12,9 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; import org.briarproject.briar.api.sharing.InvitationMessage; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Test; @@ -22,7 +22,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import static org.briarproject.briar.BriarTestUtils.assertGroupCount; +import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupMessageValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupMessageValidatorTest.java index e8e9bbb8c..a4cf4603b 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupMessageValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/GroupMessageValidatorTest.java @@ -1,6 +1,5 @@ package org.briarproject.briar.privategroup; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.BdfMessageContext; import org.briarproject.bramble.api.data.BdfDictionary; @@ -9,6 +8,7 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.InvalidMessageException; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.ValidatorTestCase; import org.briarproject.briar.api.privategroup.MessageType; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; @@ -21,12 +21,12 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.bramble.TestUtils.getRandomString; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getRandomString; import static org.briarproject.briar.api.privategroup.GroupMessageFactory.SIGNING_LABEL_JOIN; import static org.briarproject.briar.api.privategroup.GroupMessageFactory.SIGNING_LABEL_POST; import static org.briarproject.briar.api.privategroup.MessageType.JOIN; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java index e9efabdf7..2d384dac7 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupIntegrationTest.java @@ -1,15 +1,12 @@ package org.briarproject.briar.privategroup; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.privategroup.GroupMember; import org.briarproject.briar.api.privategroup.GroupMessage; import org.briarproject.briar.api.privategroup.GroupMessageHeader; @@ -17,6 +14,9 @@ import org.briarproject.briar.api.privategroup.JoinMessageHeader; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java index a6d8d0c28..943c4dabe 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/PrivateGroupManagerIntegrationTest.java @@ -1,14 +1,11 @@ package org.briarproject.briar.privategroup; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.data.BdfList; import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.client.MessageTracker.GroupCount; import org.briarproject.briar.api.privategroup.GroupMember; import org.briarproject.briar.api.privategroup.GroupMessage; @@ -16,15 +13,18 @@ import org.briarproject.briar.api.privategroup.GroupMessageHeader; import org.briarproject.briar.api.privategroup.JoinMessageHeader; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupManager; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Test; import java.util.Collection; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.api.privategroup.Visibility.INVISIBLE; import static org.briarproject.briar.api.privategroup.Visibility.REVEALED_BY_CONTACT; import static org.briarproject.briar.api.privategroup.Visibility.REVEALED_BY_US; @@ -42,6 +42,7 @@ public class PrivateGroupManagerIntegrationTest private PrivateGroupManager groupManager0, groupManager1, groupManager2; @Before + @Override public void setUp() throws Exception { super.setUp(); diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java index 69422fb83..9ce107eee 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java @@ -1,6 +1,5 @@ package org.briarproject.briar.privategroup.invitation; -import org.briarproject.bramble.BrambleMockTestCase; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; @@ -16,6 +15,7 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.system.Clock; +import org.briarproject.bramble.test.BrambleMockTestCase; import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.privategroup.GroupMessageFactory; import org.briarproject.briar.api.privategroup.PrivateGroup; @@ -23,9 +23,9 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.briarproject.briar.api.privategroup.PrivateGroupManager; import org.jmock.Expectations; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.briar.api.privategroup.PrivateGroupManager.*; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID; import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID; import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT; import static org.briarproject.briar.privategroup.invitation.MessageType.INVITE; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngineTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngineTest.java index 3456b263d..d116e018d 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngineTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/CreatorProtocolEngineTest.java @@ -5,9 +5,9 @@ import org.briarproject.briar.api.client.ProtocolStateException; import org.jmock.Expectations; import org.junit.Test; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.privategroup.invitation.CreatorState.DISSOLVED; import static org.briarproject.briar.privategroup.invitation.CreatorState.ERROR; import static org.briarproject.briar.privategroup.invitation.CreatorState.INVITED; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java index 4f7f242f9..aa1f95ae6 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java @@ -1,7 +1,5 @@ package org.briarproject.briar.privategroup.invitation; -import org.briarproject.bramble.BrambleMockTestCase; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.client.ContactGroupFactory; @@ -21,6 +19,8 @@ import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.BrambleMockTestCase; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.privategroup.PrivateGroup; @@ -44,11 +44,11 @@ import java.util.Map; import javax.annotation.Nullable; import static junit.framework.TestCase.fail; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.bramble.TestUtils.getRandomString; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getRandomString; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROUP_SALT_LENGTH; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH; import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidatorTest.java index 077208984..fe79b3678 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationValidatorTest.java @@ -1,6 +1,5 @@ package org.briarproject.briar.privategroup.invitation; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.client.BdfMessageContext; @@ -11,6 +10,7 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.ValidatorTestCase; import org.briarproject.briar.api.privategroup.PrivateGroup; import org.briarproject.briar.api.privategroup.PrivateGroupFactory; import org.jmock.Expectations; @@ -18,12 +18,12 @@ import org.junit.Test; import java.security.GeneralSecurityException; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; -import static org.briarproject.bramble.TestUtils.getRandomString; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; +import static org.briarproject.bramble.test.TestUtils.getRandomString; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROUP_SALT_LENGTH; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_INVITATION_MSG_LENGTH; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngineTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngineTest.java index d45ec461b..bc83f9053 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngineTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/InviteeProtocolEngineTest.java @@ -17,11 +17,11 @@ import org.junit.Test; import java.util.Collections; import java.util.Map; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.privategroup.invitation.InviteeState.ACCEPTED; import static org.briarproject.briar.privategroup.invitation.InviteeState.DISSOLVED; import static org.briarproject.briar.privategroup.invitation.InviteeState.ERROR; diff --git a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngineTest.java b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngineTest.java index 00fac93a8..fb3ebb49a 100644 --- a/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngineTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/PeerProtocolEngineTest.java @@ -5,10 +5,10 @@ import org.briarproject.briar.api.client.ProtocolStateException; import org.jmock.Expectations; import org.junit.Test; -import static org.briarproject.bramble.TestUtils.getRandomId; import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE; +import static org.briarproject.bramble.test.TestUtils.getRandomId; import static org.briarproject.briar.privategroup.invitation.PeerState.AWAIT_MEMBER; import static org.briarproject.briar.privategroup.invitation.PeerState.BOTH_JOINED; import static org.briarproject.briar.privategroup.invitation.PeerState.ERROR; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java index 58fc86ee2..e5e65f94f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java @@ -2,7 +2,6 @@ package org.briarproject.briar.sharing; import net.jodah.concurrentunit.Waiter; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchGroupException; @@ -10,9 +9,7 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.blog.Blog; import org.briarproject.briar.api.blog.BlogInvitationRequest; import org.briarproject.briar.api.blog.BlogInvitationResponse; @@ -21,6 +18,9 @@ import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.blog.event.BlogInvitationRequestReceivedEvent; import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent; import org.briarproject.briar.api.sharing.InvitationMessage; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.briarproject.briar.BriarTestUtils.assertGroupCount; import static org.briarproject.briar.api.blog.BlogSharingManager.CLIENT_ID; +import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java index 8e6c2dcb4..72c0156b2 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java @@ -2,7 +2,6 @@ package org.briarproject.briar.sharing; import net.jodah.concurrentunit.Waiter; -import org.briarproject.bramble.TestDatabaseModule; import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.data.BdfList; @@ -13,9 +12,7 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.Group; -import org.briarproject.briar.BriarIntegrationTest; -import org.briarproject.briar.BriarIntegrationTestComponent; -import org.briarproject.briar.DaggerBriarIntegrationTestComponent; +import org.briarproject.bramble.test.TestDatabaseModule; import org.briarproject.briar.api.client.MessageQueueManager; import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.forum.Forum; @@ -29,6 +26,9 @@ import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEven import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent; import org.briarproject.briar.api.sharing.InvitationMessage; import org.briarproject.briar.api.sharing.SharingInvitationItem; +import org.briarproject.briar.test.BriarIntegrationTest; +import org.briarproject.briar.test.BriarIntegrationTestComponent; +import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -39,8 +39,8 @@ import java.util.Collection; import java.util.List; import static junit.framework.Assert.assertNotNull; -import static org.briarproject.bramble.TestUtils.getRandomBytes; -import static org.briarproject.bramble.TestUtils.getRandomString; +import static org.briarproject.bramble.test.TestUtils.getRandomBytes; +import static org.briarproject.bramble.test.TestUtils.getRandomString; import static org.briarproject.briar.api.forum.ForumConstants.FORUM_SALT_LENGTH; import static org.briarproject.briar.api.forum.ForumSharingManager.CLIENT_ID; import static org.briarproject.briar.api.sharing.SharingConstants.SHARE_MSG_TYPE_INVITATION; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingValidatorTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingValidatorTest.java index 104a1962d..52887134c 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingValidatorTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingValidatorTest.java @@ -1,12 +1,12 @@ package org.briarproject.briar.sharing; -import org.briarproject.bramble.TestUtils; -import org.briarproject.bramble.ValidatorTestCase; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.UniqueId; import org.briarproject.bramble.api.client.BdfMessageContext; import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfList; +import org.briarproject.bramble.test.TestUtils; +import org.briarproject.bramble.test.ValidatorTestCase; import org.briarproject.briar.api.client.SessionId; import org.junit.Test; diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/SharingManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/SharingManagerImplTest.java index b29ddbab6..e38df1992 100644 --- a/briar-core/src/test/java/org/briarproject/briar/sharing/SharingManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/sharing/SharingManagerImplTest.java @@ -1,6 +1,6 @@ package org.briarproject.briar.sharing; -import org.briarproject.briar.BriarTestCase; +import org.briarproject.briar.test.BriarTestCase; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/briar-core/src/test/java/org/briarproject/briar/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java similarity index 97% rename from briar-core/src/test/java/org/briarproject/briar/BriarIntegrationTest.java rename to briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java index 454d79ebc..7d216adca 100644 --- a/briar-core/src/test/java/org/briarproject/briar/BriarIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java @@ -1,8 +1,7 @@ -package org.briarproject.briar; +package org.briarproject.briar.test; import net.jodah.concurrentunit.Waiter; -import org.briarproject.bramble.TestUtils; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.client.ContactGroupFactory; import org.briarproject.bramble.api.contact.Contact; @@ -30,6 +29,8 @@ import org.briarproject.bramble.lifecycle.LifecycleModule; import org.briarproject.bramble.properties.PropertiesModule; import org.briarproject.bramble.sync.SyncModule; import org.briarproject.bramble.system.SystemModule; +import org.briarproject.bramble.test.TestPluginConfigModule; +import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.transport.TransportModule; import org.briarproject.briar.api.blog.BlogFactory; import org.briarproject.briar.api.blog.BlogPostFactory; @@ -59,11 +60,10 @@ import javax.annotation.Nullable; import javax.inject.Inject; import static junit.framework.Assert.assertNotNull; -import static org.briarproject.bramble.TestUtils.getSecretKey; import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED; import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID; import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING; -import static org.briarproject.briar.TestPluginConfigModule.MAX_LATENCY; +import static org.briarproject.bramble.test.TestUtils.getSecretKey; import static org.junit.Assert.assertTrue; @MethodsNotNullByDefault @@ -325,7 +325,7 @@ public abstract class BriarIntegrationTest