diff --git a/briar-tests/src/org/briarproject/BriarTestCase.java b/briar-tests/src/org/briarproject/BriarTestCase.java
index a26508b8fde41babcec2388713650994c0b47f86..4f97947d517c7e4b9425909d9d4eb69d3b19b703 100644
--- a/briar-tests/src/org/briarproject/BriarTestCase.java
+++ b/briar-tests/src/org/briarproject/BriarTestCase.java
@@ -2,9 +2,9 @@ package org.briarproject;
import java.lang.Thread.UncaughtExceptionHandler;
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
-public abstract class BriarTestCase extends TestCase {
+public abstract class BriarTestCase {
public BriarTestCase() {
// Ensure exceptions thrown on worker threads cause tests to fail
diff --git a/briar-tests/src/org/briarproject/LockFairnessTest.java b/briar-tests/src/org/briarproject/LockFairnessTest.java
index 30da3436b6ee68ce52fb4cef14273e1533e646e2..7daaf557e08b15ed9cb8b822528d113a93596d31 100644
--- a/briar-tests/src/org/briarproject/LockFairnessTest.java
+++ b/briar-tests/src/org/briarproject/LockFairnessTest.java
@@ -1,12 +1,15 @@
package org.briarproject;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import org.junit.Test;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.junit.Test;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class LockFairnessTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java b/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
index 557d4a990b8d9114d860fa48501f393deda702d0..ce87ecd76880c292879a1ffb33c3aa6828f264a8 100644
--- a/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
@@ -1,16 +1,7 @@
package org.briarproject;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Random;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
@@ -46,8 +37,20 @@ import org.briarproject.messaging.MessagingModule;
import org.briarproject.transport.TransportModule;
import org.junit.Test;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Random;
+
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public class ProtocolIntegrationTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/TestDatabaseConfig.java b/briar-tests/src/org/briarproject/TestDatabaseConfig.java
index 285a6c42a53eb124b343b8a1d57b1e4a974c381f..e4efc42047eb88ccf6b93f6ca23cd576938c2cbd 100644
--- a/briar-tests/src/org/briarproject/TestDatabaseConfig.java
+++ b/briar-tests/src/org/briarproject/TestDatabaseConfig.java
@@ -1,10 +1,10 @@
package org.briarproject;
-import java.io.File;
-
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.db.DatabaseConfig;
+import java.io.File;
+
public class TestDatabaseConfig implements DatabaseConfig {
private final File dir;
diff --git a/briar-tests/src/org/briarproject/TestDatabaseModule.java b/briar-tests/src/org/briarproject/TestDatabaseModule.java
index 8cff99d56fae768c35997f2a29139ce5aeb612a7..263ec20c2f3341c504d3e88dc3c76028c3922356 100644
--- a/briar-tests/src/org/briarproject/TestDatabaseModule.java
+++ b/briar-tests/src/org/briarproject/TestDatabaseModule.java
@@ -1,11 +1,11 @@
package org.briarproject;
-import java.io.File;
+import com.google.inject.AbstractModule;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.system.FileUtils;
-import com.google.inject.AbstractModule;
+import java.io.File;
public class TestDatabaseModule extends AbstractModule {
diff --git a/briar-tests/src/org/briarproject/TestFileUtils.java b/briar-tests/src/org/briarproject/TestFileUtils.java
index e81b16bde39acfd65947f69382228d4652466494..78a02ff818068411f3b807db3dacfdf6d81c4af9 100644
--- a/briar-tests/src/org/briarproject/TestFileUtils.java
+++ b/briar-tests/src/org/briarproject/TestFileUtils.java
@@ -1,17 +1,17 @@
package org.briarproject;
+import org.briarproject.api.system.FileUtils;
+
import java.io.File;
import java.io.IOException;
-import org.briarproject.api.system.FileUtils;
-
public class TestFileUtils implements FileUtils {
public long getTotalSpace(File f) throws IOException {
- return f.getTotalSpace(); // Requires Java 1.6
+ return f.getTotalSpace();
}
public long getFreeSpace(File f) throws IOException {
- return f.getUsableSpace(); // Requires Java 1.6
+ return f.getUsableSpace();
}
}
diff --git a/briar-tests/src/org/briarproject/TestLifecycleModule.java b/briar-tests/src/org/briarproject/TestLifecycleModule.java
index 580b445e2b67bc25962b917a92071fc48be37f23..a6b6a618638572d9488fbde7e051a42911b0a93f 100644
--- a/briar-tests/src/org/briarproject/TestLifecycleModule.java
+++ b/briar-tests/src/org/briarproject/TestLifecycleModule.java
@@ -1,15 +1,15 @@
package org.briarproject;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import com.google.inject.AbstractModule;
import org.briarproject.api.lifecycle.IoExecutor;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.lifecycle.ShutdownManager;
-import com.google.inject.AbstractModule;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
public class TestLifecycleModule extends AbstractModule {
diff --git a/briar-tests/src/org/briarproject/TestMessage.java b/briar-tests/src/org/briarproject/TestMessage.java
index af9d137b3ce4c2590ee79738ef795ee9e634eb28..4249a809f43af91a9a9d40d3fd29dc2b7da3c99c 100644
--- a/briar-tests/src/org/briarproject/TestMessage.java
+++ b/briar-tests/src/org/briarproject/TestMessage.java
@@ -1,13 +1,13 @@
package org.briarproject;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
import org.briarproject.api.Author;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageId;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
public class TestMessage implements Message {
private final MessageId id, parent;
diff --git a/briar-tests/src/org/briarproject/TestSeedProvider.java b/briar-tests/src/org/briarproject/TestSeedProvider.java
index aefeeda5c9daa06a7e0224b9e79f0939b2407162..2169dcddd0ec3441671507848ecdd02796d891fd 100644
--- a/briar-tests/src/org/briarproject/TestSeedProvider.java
+++ b/briar-tests/src/org/briarproject/TestSeedProvider.java
@@ -1,9 +1,9 @@
package org.briarproject;
-import java.util.Random;
-
import org.briarproject.api.system.SeedProvider;
+import java.util.Random;
+
public class TestSeedProvider implements SeedProvider {
private final Random random = new Random();
diff --git a/briar-tests/src/org/briarproject/TestSystemModule.java b/briar-tests/src/org/briarproject/TestSystemModule.java
index 1015deb9ec235b63492d6f8c3141740caaf5eba1..9734f533e01226083dfcdc2b4d7a707194ebc4b2 100644
--- a/briar-tests/src/org/briarproject/TestSystemModule.java
+++ b/briar-tests/src/org/briarproject/TestSystemModule.java
@@ -1,13 +1,13 @@
package org.briarproject;
+import com.google.inject.AbstractModule;
+
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SeedProvider;
import org.briarproject.api.system.Timer;
import org.briarproject.system.SystemClock;
import org.briarproject.system.SystemTimer;
-import com.google.inject.AbstractModule;
-
public class TestSystemModule extends AbstractModule {
protected void configure() {
diff --git a/briar-tests/src/org/briarproject/TestUtils.java b/briar-tests/src/org/briarproject/TestUtils.java
index 861c866d85c8605e0ce8f7534391e7c8e42c6275..aeae21eeb5e38a73fba90fb19b1f7e9cbc9ccc66 100644
--- a/briar-tests/src/org/briarproject/TestUtils.java
+++ b/briar-tests/src/org/briarproject/TestUtils.java
@@ -1,5 +1,7 @@
package org.briarproject;
+import org.briarproject.api.UniqueId;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -7,8 +9,6 @@ import java.io.PrintStream;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import org.briarproject.api.UniqueId;
-
public class TestUtils {
private static final AtomicInteger nextTestDir =
diff --git a/briar-tests/src/org/briarproject/crypto/EllipticCurveMultiplicationTest.java b/briar-tests/src/org/briarproject/crypto/EllipticCurveMultiplicationTest.java
index c3f2dd18530dbd47302f9e9e94ed54e9d671c05e..6ee969089583f9992b85fc9243c73eaf4c07603a 100644
--- a/briar-tests/src/org/briarproject/crypto/EllipticCurveMultiplicationTest.java
+++ b/briar-tests/src/org/briarproject/crypto/EllipticCurveMultiplicationTest.java
@@ -1,10 +1,5 @@
package org.briarproject.crypto;
-import static org.briarproject.crypto.EllipticCurveConstants.PARAMETERS;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
import org.briarproject.BriarTestCase;
import org.junit.Test;
import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
@@ -19,6 +14,12 @@ import org.spongycastle.crypto.params.ECPublicKeyParameters;
import org.spongycastle.math.ec.ECCurve;
import org.spongycastle.math.ec.ECPoint;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
+import static org.briarproject.crypto.EllipticCurveConstants.PARAMETERS;
+import static org.junit.Assert.assertEquals;
+
public class EllipticCurveMultiplicationTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/crypto/EllipticCurvePerformanceTest.java b/briar-tests/src/org/briarproject/crypto/EllipticCurvePerformanceTest.java
index 84f2ca3c8866dac64c654c3269711e537c201bd4..a9b10b0b9e6559cffe92c4d9e5811c73361ccb4c 100644
--- a/briar-tests/src/org/briarproject/crypto/EllipticCurvePerformanceTest.java
+++ b/briar-tests/src/org/briarproject/crypto/EllipticCurvePerformanceTest.java
@@ -1,12 +1,5 @@
package org.briarproject.crypto;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import org.spongycastle.asn1.sec.SECNamedCurves;
import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
import org.spongycastle.asn1.x9.X9ECParameters;
@@ -28,6 +21,13 @@ import org.spongycastle.math.ec.ECCurve;
import org.spongycastle.math.ec.ECPoint;
import org.spongycastle.math.ec.MontgomeryLadderMultiplier;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
// Not a JUnit test
public class EllipticCurvePerformanceTest {
diff --git a/briar-tests/src/org/briarproject/crypto/FortunaGeneratorTest.java b/briar-tests/src/org/briarproject/crypto/FortunaGeneratorTest.java
index b3f92a65c7bc842e1a5973025f578553c676df07..9946ea464099de84fa21d7e9a88a1986f92d4b20 100644
--- a/briar-tests/src/org/briarproject/crypto/FortunaGeneratorTest.java
+++ b/briar-tests/src/org/briarproject/crypto/FortunaGeneratorTest.java
@@ -1,13 +1,14 @@
package org.briarproject.crypto;
-import static org.junit.Assert.assertArrayEquals;
-
import org.briarproject.BriarTestCase;
import org.junit.Test;
import org.spongycastle.crypto.BlockCipher;
import org.spongycastle.crypto.engines.AESLightEngine;
import org.spongycastle.crypto.params.KeyParameter;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
public class FortunaGeneratorTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/crypto/FortunaSecureRandomTest.java b/briar-tests/src/org/briarproject/crypto/FortunaSecureRandomTest.java
index b464729f31fb3e8a03bae5f06806232abea50414..260c38cd8553cbce71ee9c19a47b21154ab56997 100644
--- a/briar-tests/src/org/briarproject/crypto/FortunaSecureRandomTest.java
+++ b/briar-tests/src/org/briarproject/crypto/FortunaSecureRandomTest.java
@@ -1,10 +1,5 @@
package org.briarproject.crypto;
-import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_1;
-import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_2;
-import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_3;
-import static org.junit.Assert.assertArrayEquals;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.MessageDigest;
import org.junit.Test;
@@ -13,6 +8,12 @@ import org.spongycastle.crypto.digests.SHA256Digest;
import org.spongycastle.crypto.engines.AESLightEngine;
import org.spongycastle.crypto.params.KeyParameter;
+import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_1;
+import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_2;
+import static org.briarproject.crypto.FortunaSecureRandom.SELF_TEST_VECTOR_3;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+
public class FortunaSecureRandomTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java b/briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java
index ae8860b687531e60dda7ac0538bcf867dce704e8..f4bfa8cd6045f2c067cb3e0c574041483016c191 100644
--- a/briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java
+++ b/briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java
@@ -1,7 +1,5 @@
package org.briarproject.crypto;
-import static org.junit.Assert.assertArrayEquals;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestSeedProvider;
import org.briarproject.api.crypto.CryptoComponent;
@@ -9,6 +7,8 @@ import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.system.SeedProvider;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+
public class KeyAgreementTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/crypto/KeyDerivationTest.java b/briar-tests/src/org/briarproject/crypto/KeyDerivationTest.java
index 631d0a44f30013084d71eb53f4c6e88927b9f90a..0e3c80a71d56460499c7d43160d3153ec6f72063 100644
--- a/briar-tests/src/org/briarproject/crypto/KeyDerivationTest.java
+++ b/briar-tests/src/org/briarproject/crypto/KeyDerivationTest.java
@@ -1,16 +1,18 @@
package org.briarproject.crypto;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestSeedProvider;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.SecretKey;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
public class KeyDerivationTest extends BriarTestCase {
private final CryptoComponent crypto;
diff --git a/briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java b/briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java
index 5a78c0cc86edc2ecacee2431a12cda05df210997..b380dee5279864f5301ecf29b47bd50ba4c94a95 100644
--- a/briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java
+++ b/briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java
@@ -1,10 +1,5 @@
package org.briarproject.crypto;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.security.GeneralSecurityException;
-import java.util.Random;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestSeedProvider;
import org.briarproject.api.crypto.KeyPair;
@@ -13,6 +8,12 @@ import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.PublicKey;
import org.junit.Test;
+import java.security.GeneralSecurityException;
+import java.util.Random;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
+
public class KeyEncodingAndParsingTest extends BriarTestCase {
private final CryptoComponentImpl crypto =
diff --git a/briar-tests/src/org/briarproject/crypto/PasswordBasedKdfTest.java b/briar-tests/src/org/briarproject/crypto/PasswordBasedKdfTest.java
index cdc59b3323a7e88b37b48ccc9bf2df006ac63744..e8fc10ce7c98bc348391c9fdd781e5f8be578e1c 100644
--- a/briar-tests/src/org/briarproject/crypto/PasswordBasedKdfTest.java
+++ b/briar-tests/src/org/briarproject/crypto/PasswordBasedKdfTest.java
@@ -1,13 +1,16 @@
package org.briarproject.crypto;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Random;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestSeedProvider;
import org.junit.Test;
+import java.util.Random;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class PasswordBasedKdfTest extends BriarTestCase {
private final CryptoComponentImpl crypto =
diff --git a/briar-tests/src/org/briarproject/crypto/PasswordStrengthEstimatorImplTest.java b/briar-tests/src/org/briarproject/crypto/PasswordStrengthEstimatorImplTest.java
index 5407daf9ae72feb4331f2b71d87134d05b10db46..249ed4a1654170dfba226ade45ed8d22671955b6 100644
--- a/briar-tests/src/org/briarproject/crypto/PasswordStrengthEstimatorImplTest.java
+++ b/briar-tests/src/org/briarproject/crypto/PasswordStrengthEstimatorImplTest.java
@@ -1,11 +1,12 @@
package org.briarproject.crypto;
-import static org.briarproject.api.crypto.PasswordStrengthEstimator.QUITE_STRONG;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.PasswordStrengthEstimator;
import org.junit.Test;
+import static org.briarproject.api.crypto.PasswordStrengthEstimator.QUITE_STRONG;
+import static org.junit.Assert.assertTrue;
+
public class PasswordStrengthEstimatorImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/crypto/StreamEncrypterImplTest.java b/briar-tests/src/org/briarproject/crypto/StreamEncrypterImplTest.java
index 44c61fdee6096f367ecc8e3ac37ae11f538adf9b..947c4bee1287599b6f321e2c64d7eb9d8ec4b4ce 100644
--- a/briar-tests/src/org/briarproject/crypto/StreamEncrypterImplTest.java
+++ b/briar-tests/src/org/briarproject/crypto/StreamEncrypterImplTest.java
@@ -1,16 +1,17 @@
package org.briarproject.crypto;
-import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
+import org.briarproject.BriarTestCase;
+import org.briarproject.api.crypto.SecretKey;
+import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.util.Random;
-import org.briarproject.BriarTestCase;
-import org.briarproject.api.crypto.SecretKey;
-import org.junit.Test;
+import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
public class StreamEncrypterImplTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/crypto/TestAuthenticatedCipher.java b/briar-tests/src/org/briarproject/crypto/TestAuthenticatedCipher.java
index 7e960613f8821b25ec9d013ca0653107be34001f..7d7acd74d98dff4f19623f10e6c71b7f3490079c 100644
--- a/briar-tests/src/org/briarproject/crypto/TestAuthenticatedCipher.java
+++ b/briar-tests/src/org/briarproject/crypto/TestAuthenticatedCipher.java
@@ -1,10 +1,10 @@
package org.briarproject.crypto;
-import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
+import org.briarproject.api.crypto.SecretKey;
import java.security.GeneralSecurityException;
-import org.briarproject.api.crypto.SecretKey;
+import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
class TestAuthenticatedCipher implements AuthenticatedCipher {
diff --git a/briar-tests/src/org/briarproject/data/ReaderImplTest.java b/briar-tests/src/org/briarproject/data/ReaderImplTest.java
index da9276279bc2a5b234be5ea923a2db7b6bc55c64..e5ac76f7aa7601cf438a186a36bb9535d304272d 100644
--- a/briar-tests/src/org/briarproject/data/ReaderImplTest.java
+++ b/briar-tests/src/org/briarproject/data/ReaderImplTest.java
@@ -1,15 +1,19 @@
package org.briarproject.data;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.api.FormatException;
import org.briarproject.util.StringUtils;
import org.junit.Test;
+import java.io.ByteArrayInputStream;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ReaderImplTest extends BriarTestCase {
private ByteArrayInputStream in = null;
@@ -174,13 +178,13 @@ public class ReaderImplTest extends BriarTestCase {
+ "38" + "4000000000000000" + "38" + "BFF0000000000000"
+ "38" + "8000000000000000" + "38" + "FFF0000000000000"
+ "38" + "7FF0000000000000" + "38" + "7FF8000000000000");
- assertEquals(0.0, r.readFloat());
- assertEquals(1.0, r.readFloat());
- assertEquals(2.0, r.readFloat());
- assertEquals(-1.0, r.readFloat());
- assertEquals(-0.0, r.readFloat());
- assertEquals(Double.NEGATIVE_INFINITY, r.readFloat());
- assertEquals(Double.POSITIVE_INFINITY, r.readFloat());
+ assertEquals(0, Double.compare(0.0, r.readFloat()));
+ assertEquals(0, Double.compare(1.0, r.readFloat()));
+ assertEquals(0, Double.compare(2.0, r.readFloat()));
+ assertEquals(0, Double.compare(-1.0, r.readFloat()));
+ assertEquals(0, Double.compare(-0.0, r.readFloat()));
+ assertEquals(0, Double.compare(Double.NEGATIVE_INFINITY, r.readFloat()));
+ assertEquals(0, Double.compare(Double.POSITIVE_INFINITY, r.readFloat()));
assertTrue(Double.isNaN(r.readFloat()));
assertTrue(r.eof());
}
diff --git a/briar-tests/src/org/briarproject/data/WriterImplTest.java b/briar-tests/src/org/briarproject/data/WriterImplTest.java
index 7697bdd77a65a0d102707389bf2e71798ec52301..cfacd0c51c87cd9b02fb34d5955cd705bce5588d 100644
--- a/briar-tests/src/org/briarproject/data/WriterImplTest.java
+++ b/briar-tests/src/org/briarproject/data/WriterImplTest.java
@@ -1,5 +1,11 @@
package org.briarproject.data;
+import org.briarproject.BriarTestCase;
+import org.briarproject.TestUtils;
+import org.briarproject.util.StringUtils;
+import org.junit.Before;
+import org.junit.Test;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -8,18 +14,13 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.briarproject.BriarTestCase;
-import org.briarproject.TestUtils;
-import org.briarproject.util.StringUtils;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
public class WriterImplTest extends BriarTestCase {
private ByteArrayOutputStream out = null;
private WriterImpl w = null;
- @Override
@Before
public void setUp() {
out = new ByteArrayOutputStream();
diff --git a/briar-tests/src/org/briarproject/db/BasicH2Test.java b/briar-tests/src/org/briarproject/db/BasicH2Test.java
index 9ddcd6dec74c0b395e2eb8d6d6a162dd5ec28052..a8b95543b76edcdcde67c41f122b36ecfc40dd26 100644
--- a/briar-tests/src/org/briarproject/db/BasicH2Test.java
+++ b/briar-tests/src/org/briarproject/db/BasicH2Test.java
@@ -1,6 +1,10 @@
package org.briarproject.db;
-import static java.sql.Types.BINARY;
+import org.briarproject.BriarTestCase;
+import org.briarproject.TestUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import java.io.File;
import java.sql.Connection;
@@ -13,11 +17,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import org.briarproject.BriarTestCase;
-import org.briarproject.TestUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static java.sql.Types.BINARY;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class BasicH2Test extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/db/DatabaseCleanerImplTest.java b/briar-tests/src/org/briarproject/db/DatabaseCleanerImplTest.java
index 093680f3b52dfa2fe059980c329ef761cda32f65..2e9bf43e224604049971058c5b45b3fae7888cc7 100644
--- a/briar-tests/src/org/briarproject/db/DatabaseCleanerImplTest.java
+++ b/briar-tests/src/org/briarproject/db/DatabaseCleanerImplTest.java
@@ -1,7 +1,5 @@
package org.briarproject.db;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.db.DbException;
import org.briarproject.api.system.Timer;
@@ -10,6 +8,10 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+
public class DatabaseCleanerImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java b/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
index f694e90c7cdfd21f573780a957fa957eb90603c6..79e79fd2dba7a3eb4a746b5f77e413cf7e4df46a 100644
--- a/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
+++ b/briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
@@ -1,10 +1,5 @@
package org.briarproject.db;
-import static org.briarproject.db.DatabaseConstants.BYTES_PER_SWEEP;
-import static org.briarproject.db.DatabaseConstants.MIN_FREE_SPACE;
-
-import java.util.Collections;
-
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.event.EventBus;
@@ -14,6 +9,11 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Collections;
+
+import static org.briarproject.db.DatabaseConstants.BYTES_PER_SWEEP;
+import static org.briarproject.db.DatabaseConstants.MIN_FREE_SPACE;
+
/**
* Tests that use the DatabaseCleaner.Callback interface of
* DatabaseComponentImpl.
diff --git a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java b/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
index 645ce2fb184513db71ea13f7c32f326f2d247aed..2e94aa96a3bc6f65c5b33d1bd66e953330f82cc9 100644
--- a/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
+++ b/briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
@@ -1,13 +1,5 @@
package org.briarproject.db;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
-import static org.briarproject.db.DatabaseConstants.MAX_OFFERED_MESSAGES;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestMessage;
import org.briarproject.TestUtils;
@@ -58,6 +50,19 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
+import static org.briarproject.db.DatabaseConstants.MAX_OFFERED_MESSAGES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
public abstract class DatabaseComponentTest extends BriarTestCase {
protected final Object txn = new Object();
diff --git a/briar-tests/src/org/briarproject/db/ExponentialBackoffTest.java b/briar-tests/src/org/briarproject/db/ExponentialBackoffTest.java
index f758e8c9e0c0be5ab1150d9f8cf58d44be5a2cd7..2fb80dd065e20fce87e0e60827b7c93b9a164892 100644
--- a/briar-tests/src/org/briarproject/db/ExponentialBackoffTest.java
+++ b/briar-tests/src/org/briarproject/db/ExponentialBackoffTest.java
@@ -3,6 +3,8 @@ package org.briarproject.db;
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ExponentialBackoffTest extends BriarTestCase {
private static final int ONE_HOUR = 60 * 60 * 1000;
diff --git a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
index ec21e4c6c0fc719b5b487d26b8dfe48dd9a3dddc..5aff9c74ab98c597509f80adbec0e88c6ff006ad 100644
--- a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
+++ b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
@@ -1,24 +1,5 @@
package org.briarproject.db;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.File;
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestDatabaseConfig;
import org.briarproject.TestFileUtils;
@@ -44,6 +25,31 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class H2DatabaseTest extends BriarTestCase {
private static final int ONE_MEGABYTE = 1024 * 1024;
@@ -87,7 +93,6 @@ public class H2DatabaseTest extends BriarTestCase {
contactId = new ContactId(1);
}
- @Override
@Before
public void setUp() {
testDir.mkdirs();
@@ -1611,7 +1616,6 @@ public class H2DatabaseTest extends BriarTestCase {
return db;
}
- @Override
@After
public void tearDown() {
TestUtils.deleteTestDirectory(testDir);
diff --git a/briar-tests/src/org/briarproject/lifecycle/ShutdownManagerImplTest.java b/briar-tests/src/org/briarproject/lifecycle/ShutdownManagerImplTest.java
index 6b6942d2691221b8b874c0583f9aad9e8698a9ad..3af216ebf47bc7fe50fceeb188b2392efa368571 100644
--- a/briar-tests/src/org/briarproject/lifecycle/ShutdownManagerImplTest.java
+++ b/briar-tests/src/org/briarproject/lifecycle/ShutdownManagerImplTest.java
@@ -1,12 +1,15 @@
package org.briarproject.lifecycle;
-import java.util.HashSet;
-import java.util.Set;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.junit.Test;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class ShutdownManagerImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/lifecycle/WindowsShutdownManagerImplTest.java b/briar-tests/src/org/briarproject/lifecycle/WindowsShutdownManagerImplTest.java
index 53b56239630015447615d09c7600d2bad6fc091e..a4156c6d1b4de27bf72db0237a5f62cacfcf4247 100644
--- a/briar-tests/src/org/briarproject/lifecycle/WindowsShutdownManagerImplTest.java
+++ b/briar-tests/src/org/briarproject/lifecycle/WindowsShutdownManagerImplTest.java
@@ -3,6 +3,9 @@ package org.briarproject.lifecycle;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class WindowsShutdownManagerImplTest extends ShutdownManagerImplTest {
@Override
diff --git a/briar-tests/src/org/briarproject/messaging/ConstantsTest.java b/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
index eb19901e5e5a7a4a6dbfb96a376978175fee6564..a96bdaee4c5bfbcdebafdd7780e85ed5f34b2e27 100644
--- a/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
+++ b/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
@@ -1,21 +1,7 @@
package org.briarproject.messaging;
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
-import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
-import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
-import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Random;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
import org.briarproject.BriarTestCase;
import org.briarproject.TestDatabaseModule;
@@ -49,8 +35,23 @@ import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.junit.Test;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Random;
+
+import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
+import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
+import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
+import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
+import static org.junit.Assert.assertTrue;
public class ConstantsTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/messaging/ConsumersTest.java b/briar-tests/src/org/briarproject/messaging/ConsumersTest.java
index c1c404c8ba672eb807ee7921c3d3ca59c64c1e5d..cdcb406c17fc94c5804098167b525a9803286214 100644
--- a/briar-tests/src/org/briarproject/messaging/ConsumersTest.java
+++ b/briar-tests/src/org/briarproject/messaging/ConsumersTest.java
@@ -1,15 +1,17 @@
package org.briarproject.messaging;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.security.GeneralSecurityException;
-import java.util.Random;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.MessageDigest;
import org.junit.Test;
+import java.security.GeneralSecurityException;
+import java.util.Random;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class ConsumersTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java b/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
index fcacc16c8ad8c0a4edb86348e418edfb36237e2d..3850d0494cab1b0d13991d26bb4e1bbdac9e8f8c 100644
--- a/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
+++ b/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
@@ -1,15 +1,7 @@
package org.briarproject.messaging;
-import static org.briarproject.api.data.DataConstants.LIST_END_LENGTH;
-import static org.briarproject.api.data.DataConstants.UNIQUE_ID_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.HEADER_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
-import static org.briarproject.api.messaging.PacketTypes.ACK;
-import static org.briarproject.api.messaging.PacketTypes.OFFER;
-import static org.briarproject.api.messaging.PacketTypes.REQUEST;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
@@ -21,8 +13,18 @@ import org.briarproject.data.DataModule;
import org.briarproject.util.ByteUtils;
import org.junit.Test;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import static org.briarproject.api.data.DataConstants.LIST_END_LENGTH;
+import static org.briarproject.api.data.DataConstants.UNIQUE_ID_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.HEADER_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
+import static org.briarproject.api.messaging.PacketTypes.ACK;
+import static org.briarproject.api.messaging.PacketTypes.OFFER;
+import static org.briarproject.api.messaging.PacketTypes.REQUEST;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class PacketReaderImplTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java b/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
index d6002c609e7a24ca615da82fb352e3ff4e780d4a..2c43be177e217aa9c6ff8273be1e6b69eeaee020 100644
--- a/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
@@ -1,16 +1,7 @@
package org.briarproject.messaging;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Random;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
import org.briarproject.BriarTestCase;
import org.briarproject.TestDatabaseModule;
@@ -53,8 +44,21 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Random;
+
+import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class SimplexMessagingIntegrationTest extends BriarTestCase {
@@ -79,7 +83,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
epoch = System.currentTimeMillis() - 2 * ROTATION_PERIOD;
}
- @Override
@Before
public void setUp() {
testDir.mkdirs();
@@ -229,7 +232,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
db.close();
}
- @Override
@After
public void tearDown() {
TestUtils.deleteTestDirectory(testDir);
diff --git a/briar-tests/src/org/briarproject/messaging/SimplexOutgoingSessionTest.java b/briar-tests/src/org/briarproject/messaging/SimplexOutgoingSessionTest.java
index fa13af51024f6cdc9938635c41ff3def51032182..e618c3ec43dad73735ee8f32690602b4c8230b7d 100644
--- a/briar-tests/src/org/briarproject/messaging/SimplexOutgoingSessionTest.java
+++ b/briar-tests/src/org/briarproject/messaging/SimplexOutgoingSessionTest.java
@@ -1,8 +1,5 @@
package org.briarproject.messaging;
-import java.util.Arrays;
-import java.util.concurrent.Executor;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.api.ContactId;
@@ -17,6 +14,9 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+
public class SimplexOutgoingSessionTest extends BriarTestCase {
private static final int MAX_MESSAGES_PER_ACK = 10;
diff --git a/briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java b/briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java
index b2237b57f16c1b4d83aa79265dc90d7720ec9b71..a31d9124018d66ee9290c9b3aaba142e1ec4f9f9 100644
--- a/briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java
+++ b/briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java
@@ -1,9 +1,5 @@
package org.briarproject.plugins;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
@@ -15,6 +11,14 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ConnectionRegistryImplTest extends BriarTestCase {
private final ContactId contactId, contactId1;
diff --git a/briar-tests/src/org/briarproject/plugins/DuplexClientTest.java b/briar-tests/src/org/briarproject/plugins/DuplexClientTest.java
index 2646dfec7ee699d4792c148ebfac992a6031e0b6..e36624a5dd6d86bb54d28956c11dac262663883f 100644
--- a/briar-tests/src/org/briarproject/plugins/DuplexClientTest.java
+++ b/briar-tests/src/org/briarproject/plugins/DuplexClientTest.java
@@ -1,10 +1,5 @@
package org.briarproject.plugins;
-import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
-
-import java.io.IOException;
-import java.util.Map;
-
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportProperties;
@@ -12,6 +7,11 @@ import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import java.io.IOException;
+import java.util.Map;
+
+import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
+
public abstract class DuplexClientTest extends DuplexTest {
protected ClientCallback callback = null;
diff --git a/briar-tests/src/org/briarproject/plugins/DuplexServerTest.java b/briar-tests/src/org/briarproject/plugins/DuplexServerTest.java
index 28bfadea20e7cf34009589eb40f9b29165e1a15c..ba73b0ace3e979c2bbf65e91d022de2e5d4c260b 100644
--- a/briar-tests/src/org/briarproject/plugins/DuplexServerTest.java
+++ b/briar-tests/src/org/briarproject/plugins/DuplexServerTest.java
@@ -1,17 +1,17 @@
package org.briarproject.plugins;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
-
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
+
public abstract class DuplexServerTest extends DuplexTest {
protected ServerCallback callback = null;
diff --git a/briar-tests/src/org/briarproject/plugins/DuplexTest.java b/briar-tests/src/org/briarproject/plugins/DuplexTest.java
index ac5a45e5b04f2f4c5d739df1d03021841218544a..5d54e12c1f7efe37075470fcbaaf348bf56f3a2d 100644
--- a/briar-tests/src/org/briarproject/plugins/DuplexTest.java
+++ b/briar-tests/src/org/briarproject/plugins/DuplexTest.java
@@ -1,10 +1,5 @@
package org.briarproject.plugins;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Random;
-import java.util.Scanner;
-
import org.briarproject.api.ContactId;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.TransportConnectionReader;
@@ -12,6 +7,11 @@ import org.briarproject.api.plugins.TransportConnectionWriter;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Random;
+import java.util.Scanner;
+
abstract class DuplexTest {
protected static final String CHALLENGE = "Carrots!";
diff --git a/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java b/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java
index 8dab883cb74cade22f78f7e63d188c9156a2d5e8..5493a0178bd8dd886a91f0e8a1348164f553a1c8 100644
--- a/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java
+++ b/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java
@@ -1,9 +1,5 @@
package org.briarproject.plugins;
-import java.util.Arrays;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DatabaseComponent;
@@ -23,6 +19,12 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import static org.junit.Assert.assertTrue;
+
public class PluginManagerImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothClientTest.java b/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothClientTest.java
index d99ac2d56a877c3248e7f54066136288180723e0..fdf768548e0e222dc2a80e9dfe455c645e00d1b9 100644
--- a/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothClientTest.java
+++ b/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothClientTest.java
@@ -1,5 +1,11 @@
package org.briarproject.plugins.bluetooth;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.plugins.DuplexClientTest;
+import org.briarproject.system.SystemClock;
+
import java.security.SecureRandom;
import java.util.Collections;
import java.util.Map;
@@ -7,12 +13,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.TransportConfig;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.plugins.DuplexClientTest;
-import org.briarproject.system.SystemClock;
-
// This is not a JUnit test - it has to be run manually while the server test
// is running on another machine
public class BluetoothClientTest extends DuplexClientTest {
diff --git a/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothServerTest.java b/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothServerTest.java
index 121f71b4031db95c9a114cc1540e7397e565f405..671a0a413e8cf57437e6641fa89813818862516f 100644
--- a/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothServerTest.java
+++ b/briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothServerTest.java
@@ -1,16 +1,16 @@
package org.briarproject.plugins.bluetooth;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.plugins.DuplexServerTest;
+import org.briarproject.system.SystemClock;
+
import java.security.SecureRandom;
import java.util.Collections;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.briarproject.api.TransportConfig;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.plugins.DuplexServerTest;
-import org.briarproject.system.SystemClock;
-
// This is not a JUnit test - it has to be run manually while the client test
// is running on another machine
public class BluetoothServerTest extends DuplexServerTest {
diff --git a/briar-tests/src/org/briarproject/plugins/file/LinuxRemovableDriveFinderTest.java b/briar-tests/src/org/briarproject/plugins/file/LinuxRemovableDriveFinderTest.java
index d79fad795e3e471d85a84e36cba7dc0b85b070ea..6505284e7a61bedf343320321c5750ec8957d9c8 100644
--- a/briar-tests/src/org/briarproject/plugins/file/LinuxRemovableDriveFinderTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/LinuxRemovableDriveFinderTest.java
@@ -3,6 +3,8 @@ package org.briarproject.plugins.file;
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class LinuxRemovableDriveFinderTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/plugins/file/MacRemovableDriveFinderTest.java b/briar-tests/src/org/briarproject/plugins/file/MacRemovableDriveFinderTest.java
index f9156c913662014221e584e9dde6106268440d8c..43e9910418688f944e00790420056642caedc20a 100644
--- a/briar-tests/src/org/briarproject/plugins/file/MacRemovableDriveFinderTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/MacRemovableDriveFinderTest.java
@@ -3,6 +3,8 @@ package org.briarproject.plugins.file;
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class MacRemovableDriveFinderTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/plugins/file/PollingRemovableDriveMonitorTest.java b/briar-tests/src/org/briarproject/plugins/file/PollingRemovableDriveMonitorTest.java
index cfaf60c2c3afe704187739211387797504e9fd06..69e559525183a8aa014f566fe5632ca06ffa3fce 100644
--- a/briar-tests/src/org/briarproject/plugins/file/PollingRemovableDriveMonitorTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/PollingRemovableDriveMonitorTest.java
@@ -1,6 +1,8 @@
package org.briarproject.plugins.file;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import org.briarproject.BriarTestCase;
+import org.briarproject.plugins.file.RemovableDriveMonitor.Callback;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -13,9 +15,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.briarproject.BriarTestCase;
-import org.briarproject.plugins.file.RemovableDriveMonitor.Callback;
-import org.junit.Test;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class PollingRemovableDriveMonitorTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
index 5ae0bbb5030235a60ebb45aa0e05fb146155a34a..f4326e9e685d292c0bd54c9aa068fe270a7fb45a 100644
--- a/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
@@ -1,15 +1,5 @@
package org.briarproject.plugins.file;
-import static org.briarproject.api.transport.TransportConstants.MIN_STREAM_LENGTH;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Executor;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestFileUtils;
import org.briarproject.TestUtils;
@@ -25,13 +15,27 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+import static org.briarproject.api.transport.TransportConstants.MIN_STREAM_LENGTH;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class RemovableDrivePluginTest extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
private final ContactId contactId = new ContactId(234);
private final FileUtils fileUtils = new TestFileUtils();
- @Override
@Before
public void setUp() {
testDir.mkdirs();
@@ -352,7 +356,6 @@ public class RemovableDrivePluginTest extends BriarTestCase {
context.assertIsSatisfied();
}
- @Override
@After
public void tearDown() {
TestUtils.deleteTestDirectory(testDir);
diff --git a/briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java b/briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java
index 8d882679b83eefa838c17afa94f8873e9bc562a9..06ac33bfc898c182805ce025de7ea1fc717e508a 100644
--- a/briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java
+++ b/briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java
@@ -1,13 +1,5 @@
package org.briarproject.plugins.file;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.plugins.file.RemovableDriveMonitor.Callback;
@@ -16,6 +8,17 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class UnixRemovableDriveMonitorTest extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
diff --git a/briar-tests/src/org/briarproject/plugins/modem/CountryCodesTest.java b/briar-tests/src/org/briarproject/plugins/modem/CountryCodesTest.java
index 29786b4432e851824434fb6fb7cb8c12571d50bb..235b6e8067586d9fb21a14867d349706ef62dd0a 100644
--- a/briar-tests/src/org/briarproject/plugins/modem/CountryCodesTest.java
+++ b/briar-tests/src/org/briarproject/plugins/modem/CountryCodesTest.java
@@ -3,6 +3,9 @@ package org.briarproject.plugins.modem;
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class CountryCodesTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/plugins/modem/ModemPluginTest.java b/briar-tests/src/org/briarproject/plugins/modem/ModemPluginTest.java
index 7966ef8c489d4de3d23f7a11786a1f6ad4f6e702..f186355b52896301b86064c7d86ab42203678754 100644
--- a/briar-tests/src/org/briarproject/plugins/modem/ModemPluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/modem/ModemPluginTest.java
@@ -1,9 +1,5 @@
package org.briarproject.plugins.modem;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportProperties;
@@ -12,6 +8,14 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class ModemPluginTest extends BriarTestCase {
private static final String ISO_1336 = "GB";
diff --git a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpClientTest.java b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpClientTest.java
index 9f7a577402bf7d15bdf664ad245aae30345174d7..ac6bfb305a4f3998fc640da13f53b5cffd381d47 100644
--- a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpClientTest.java
+++ b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpClientTest.java
@@ -1,16 +1,16 @@
package org.briarproject.plugins.tcp;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.plugins.DuplexClientTest;
+
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.TransportConfig;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.plugins.DuplexClientTest;
-
// This is not a JUnit test - it has to be run manually while the server test
// is running on another machine
public class LanTcpClientTest extends DuplexClientTest {
diff --git a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java
index fa609ecf8aeff1d5d4c841c23efd4e076abd395c..b929c8f528c19f9b13e01d025a1cddf13821833d 100644
--- a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java
+++ b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java
@@ -1,6 +1,13 @@
package org.briarproject.plugins.tcp;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import org.briarproject.BriarTestCase;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.junit.Test;
import java.io.IOException;
import java.net.Inet4Address;
@@ -17,14 +24,10 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.briarproject.BriarTestCase;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.TransportConfig;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.junit.Test;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class LanTcpPluginTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpServerTest.java b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpServerTest.java
index 7531978148639e5b2b1eb232ecacbb8caf505582..3a48a71c96efb9a68a20972943a88263831989c2 100644
--- a/briar-tests/src/org/briarproject/plugins/tcp/LanTcpServerTest.java
+++ b/briar-tests/src/org/briarproject/plugins/tcp/LanTcpServerTest.java
@@ -1,14 +1,14 @@
package org.briarproject.plugins.tcp;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.plugins.DuplexServerTest;
+
import java.util.Collections;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.briarproject.api.TransportConfig;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.plugins.DuplexServerTest;
-
// This is not a JUnit test - it has to be run manually while the client test
// is running on another machine
public class LanTcpServerTest extends DuplexServerTest {
diff --git a/briar-tests/src/org/briarproject/system/LinuxSeedProviderTest.java b/briar-tests/src/org/briarproject/system/LinuxSeedProviderTest.java
index ff03eaccf3239e62b61fe6157a399ac8d2b6f4b4..4a8f9ab160b0aee83e2f446bd030d9beb5078fa1 100644
--- a/briar-tests/src/org/briarproject/system/LinuxSeedProviderTest.java
+++ b/briar-tests/src/org/briarproject/system/LinuxSeedProviderTest.java
@@ -1,14 +1,5 @@
package org.briarproject.system;
-import static org.briarproject.api.system.SeedProvider.SEED_BYTES;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.api.Bytes;
@@ -17,11 +8,21 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+
+import static org.briarproject.api.system.SeedProvider.SEED_BYTES;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class LinuxSeedProviderTest extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
- @Override
@Before
public void setUp() {
testDir.mkdirs();
@@ -84,7 +85,6 @@ public class LinuxSeedProviderTest extends BriarTestCase {
assertArrayEquals(seed, p.getSeed());
}
- @Override
@After
public void tearDown() {
TestUtils.deleteTestDirectory(testDir);
diff --git a/briar-tests/src/org/briarproject/transport/KeyManagerImplTest.java b/briar-tests/src/org/briarproject/transport/KeyManagerImplTest.java
index 51493518c95f85ab30e1fd25c7f149e63076dab8..210bd4b97ba92f73868731084306465d78f000d1 100644
--- a/briar-tests/src/org/briarproject/transport/KeyManagerImplTest.java
+++ b/briar-tests/src/org/briarproject/transport/KeyManagerImplTest.java
@@ -1,11 +1,5 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Arrays;
-import java.util.Collections;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
@@ -23,6 +17,15 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class KeyManagerImplTest extends BriarTestCase {
private static final long EPOCH = 1000L * 1000L * 1000L * 1000L;
diff --git a/briar-tests/src/org/briarproject/transport/KeyRotationIntegrationTest.java b/briar-tests/src/org/briarproject/transport/KeyRotationIntegrationTest.java
index b5bcaa5b218416b3f296ffeb36add3d2b6d91609..72ec029dd67ab02de7878066f2ef684b9454fdb4 100644
--- a/briar-tests/src/org/briarproject/transport/KeyRotationIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/transport/KeyRotationIntegrationTest.java
@@ -1,12 +1,5 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Arrays;
-import java.util.Collections;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
@@ -29,6 +22,16 @@ import org.jmock.api.Action;
import org.jmock.api.Invocation;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
public class KeyRotationIntegrationTest extends BriarTestCase {
private static final long EPOCH = 1000L * 1000L * 1000L * 1000L;
diff --git a/briar-tests/src/org/briarproject/transport/ReorderingWindowTest.java b/briar-tests/src/org/briarproject/transport/ReorderingWindowTest.java
index db802cd1d84ec6e30f7b155b73716d9c1ddd76f9..e0d567069fb269773d25822dc432f6ef63e1b0ab 100644
--- a/briar-tests/src/org/briarproject/transport/ReorderingWindowTest.java
+++ b/briar-tests/src/org/briarproject/transport/ReorderingWindowTest.java
@@ -1,13 +1,17 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.REORDERING_WINDOW_SIZE;
-import static org.briarproject.util.ByteUtils.MAX_32_BIT_UNSIGNED;
-import static org.junit.Assert.assertArrayEquals;
+import org.briarproject.BriarTestCase;
+import org.junit.Test;
import java.util.Collection;
-import org.briarproject.BriarTestCase;
-import org.junit.Test;
+import static org.briarproject.api.transport.TransportConstants.REORDERING_WINDOW_SIZE;
+import static org.briarproject.util.ByteUtils.MAX_32_BIT_UNSIGNED;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class ReorderingWindowTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/transport/StreamReaderImplTest.java b/briar-tests/src/org/briarproject/transport/StreamReaderImplTest.java
index 7e9e97bb2f92c773e0e2c7b36e56e058d32396cc..c186400cf6c4755461045ebee086a29fc8d6c354 100644
--- a/briar-tests/src/org/briarproject/transport/StreamReaderImplTest.java
+++ b/briar-tests/src/org/briarproject/transport/StreamReaderImplTest.java
@@ -1,13 +1,14 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.MAX_PAYLOAD_LENGTH;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.StreamDecrypter;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import static org.briarproject.api.transport.TransportConstants.MAX_PAYLOAD_LENGTH;
+import static org.junit.Assert.assertEquals;
+
public class StreamReaderImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/transport/StreamWriterImplTest.java b/briar-tests/src/org/briarproject/transport/StreamWriterImplTest.java
index 5512f7bd45281b0be5b2cb33f61cb75a4049c839..6bf6e9dff3183e3a339846139670f61f8cdf4cfa 100644
--- a/briar-tests/src/org/briarproject/transport/StreamWriterImplTest.java
+++ b/briar-tests/src/org/briarproject/transport/StreamWriterImplTest.java
@@ -1,13 +1,14 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.MAX_PAYLOAD_LENGTH;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.StreamEncrypter;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
+import static org.briarproject.api.transport.TransportConstants.MAX_PAYLOAD_LENGTH;
+import static org.junit.Assert.assertEquals;
+
public class StreamWriterImplTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java b/briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java
index a327bdaa9c3c2919e9558e8879f7d52168590cae..9d06e52a4f1389abbc556dd6c1c08e297dd384a5 100644
--- a/briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java
+++ b/briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java
@@ -1,16 +1,16 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
+import org.briarproject.api.FormatException;
+import org.briarproject.api.crypto.StreamDecrypter;
+import org.briarproject.util.ByteUtils;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import org.briarproject.api.FormatException;
-import org.briarproject.api.crypto.StreamDecrypter;
-import org.briarproject.util.ByteUtils;
+import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
class TestStreamDecrypter implements StreamDecrypter {
diff --git a/briar-tests/src/org/briarproject/transport/TestStreamEncrypter.java b/briar-tests/src/org/briarproject/transport/TestStreamEncrypter.java
index 9034810183665f77c625b3d5a249d1eb48189031..6aa4c806843ff51067beef93e0b7aadfcdb5dfb6 100644
--- a/briar-tests/src/org/briarproject/transport/TestStreamEncrypter.java
+++ b/briar-tests/src/org/briarproject/transport/TestStreamEncrypter.java
@@ -1,14 +1,14 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
+import org.briarproject.api.crypto.StreamEncrypter;
+import org.briarproject.util.ByteUtils;
import java.io.IOException;
import java.io.OutputStream;
-import org.briarproject.api.crypto.StreamEncrypter;
-import org.briarproject.util.ByteUtils;
+import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
class TestStreamEncrypter implements StreamEncrypter {
diff --git a/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java b/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
index b4922bdea6095f5331c22d2852ef23a6a6af0b07..b3739706114da8ebe97ae0946b0ff48cfebf60d1 100644
--- a/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
@@ -1,8 +1,9 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
+import org.briarproject.BriarTestCase;
+import org.briarproject.api.crypto.StreamDecrypter;
+import org.briarproject.api.crypto.StreamEncrypter;
+import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -11,10 +12,10 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Random;
-import org.briarproject.BriarTestCase;
-import org.briarproject.api.crypto.StreamDecrypter;
-import org.briarproject.api.crypto.StreamEncrypter;
-import org.junit.Test;
+import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
public class TransportIntegrationTest extends BriarTestCase {
diff --git a/briar-tests/src/org/briarproject/transport/TransportTagRecogniserTest.java b/briar-tests/src/org/briarproject/transport/TransportTagRecogniserTest.java
index 94bdd863650b34ba00e614969d5250e0b8de1b07..d6287599f744ea21817236ee60d0092bd33a6a43 100644
--- a/briar-tests/src/org/briarproject/transport/TransportTagRecogniserTest.java
+++ b/briar-tests/src/org/briarproject/transport/TransportTagRecogniserTest.java
@@ -1,10 +1,5 @@
package org.briarproject.transport;
-import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Random;
-
import org.briarproject.BriarTestCase;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
@@ -21,6 +16,14 @@ import org.jmock.api.Action;
import org.jmock.api.Invocation;
import org.junit.Test;
+import java.util.Random;
+
+import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
public class TransportTagRecogniserTest extends BriarTestCase {
private final ContactId contactId = new ContactId(234);
diff --git a/briar-tests/src/org/briarproject/util/ByteUtilsTest.java b/briar-tests/src/org/briarproject/util/ByteUtilsTest.java
index 24e9610170dc7c6da9aa49f982d6c1144f357eba..0df6548bd6c60dff8304b0cacd1748c77a5a9a07 100644
--- a/briar-tests/src/org/briarproject/util/ByteUtilsTest.java
+++ b/briar-tests/src/org/briarproject/util/ByteUtilsTest.java
@@ -3,6 +3,8 @@ package org.briarproject.util;
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ByteUtilsTest extends BriarTestCase {
@Test
diff --git a/briar-tests/src/org/briarproject/util/StringUtilsTest.java b/briar-tests/src/org/briarproject/util/StringUtilsTest.java
index 0d3b331aded834f279c89301f3829ee880c80194..9ac929b3a3b31baca35ff352594ae8bb764b36f3 100644
--- a/briar-tests/src/org/briarproject/util/StringUtilsTest.java
+++ b/briar-tests/src/org/briarproject/util/StringUtilsTest.java
@@ -1,10 +1,12 @@
package org.briarproject.util;
-import static org.junit.Assert.assertArrayEquals;
-
import org.briarproject.BriarTestCase;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class StringUtilsTest extends BriarTestCase {
@Test