From 123dff3a3d1429d3404d11d04a3a0d5a6f9e947b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 8 Dec 2015 14:53:50 +0000
Subject: [PATCH] Don't mix JUnit 4 annotations with JUnit3 TestCase.

---
 .../src/org/briarproject/BriarTestCase.java   |  4 +-
 .../org/briarproject/LockFairnessTest.java    |  7 ++-
 .../briarproject/ProtocolIntegrationTest.java | 29 ++++++------
 .../org/briarproject/TestDatabaseConfig.java  |  4 +-
 .../org/briarproject/TestDatabaseModule.java  |  4 +-
 .../src/org/briarproject/TestFileUtils.java   |  8 ++--
 .../org/briarproject/TestLifecycleModule.java |  8 ++--
 .../src/org/briarproject/TestMessage.java     |  6 +--
 .../org/briarproject/TestSeedProvider.java    |  4 +-
 .../org/briarproject/TestSystemModule.java    |  4 +-
 .../src/org/briarproject/TestUtils.java       |  4 +-
 .../EllipticCurveMultiplicationTest.java      | 11 +++--
 .../crypto/EllipticCurvePerformanceTest.java  | 14 +++---
 .../crypto/FortunaGeneratorTest.java          |  5 +-
 .../crypto/FortunaSecureRandomTest.java       | 11 +++--
 .../briarproject/crypto/KeyAgreementTest.java |  4 +-
 .../crypto/KeyDerivationTest.java             | 12 +++--
 .../crypto/KeyEncodingAndParsingTest.java     | 11 +++--
 .../crypto/PasswordBasedKdfTest.java          | 11 +++--
 .../PasswordStrengthEstimatorImplTest.java    |  5 +-
 .../crypto/StreamEncrypterImplTest.java       | 15 +++---
 .../crypto/TestAuthenticatedCipher.java       |  4 +-
 .../org/briarproject/data/ReaderImplTest.java | 26 ++++++-----
 .../org/briarproject/data/WriterImplTest.java | 13 +++---
 .../src/org/briarproject/db/BasicH2Test.java  | 17 ++++---
 .../db/DatabaseCleanerImplTest.java           |  6 ++-
 .../db/DatabaseComponentImplTest.java         | 10 ++--
 .../db/DatabaseComponentTest.java             | 21 +++++----
 .../db/ExponentialBackoffTest.java            |  2 +
 .../org/briarproject/db/H2DatabaseTest.java   | 46 ++++++++++---------
 .../lifecycle/ShutdownManagerImplTest.java    |  9 ++--
 .../WindowsShutdownManagerImplTest.java       |  3 ++
 .../briarproject/messaging/ConstantsTest.java | 37 +++++++--------
 .../briarproject/messaging/ConsumersTest.java | 12 +++--
 .../messaging/PacketReaderImplTest.java       | 26 ++++++-----
 .../SimplexMessagingIntegrationTest.java      | 32 +++++++------
 .../messaging/SimplexOutgoingSessionTest.java |  6 +--
 .../plugins/ConnectionRegistryImplTest.java   | 12 +++--
 .../plugins/DuplexClientTest.java             | 10 ++--
 .../plugins/DuplexServerTest.java             | 12 ++---
 .../org/briarproject/plugins/DuplexTest.java  | 10 ++--
 .../plugins/PluginManagerImplTest.java        | 10 ++--
 .../bluetooth/BluetoothClientTest.java        | 12 ++---
 .../bluetooth/BluetoothServerTest.java        | 10 ++--
 .../file/LinuxRemovableDriveFinderTest.java   |  2 +
 .../file/MacRemovableDriveFinderTest.java     |  2 +
 .../PollingRemovableDriveMonitorTest.java     | 11 +++--
 .../file/RemovableDrivePluginTest.java        | 27 ++++++-----
 .../file/UnixRemovableDriveMonitorTest.java   | 19 ++++----
 .../plugins/modem/CountryCodesTest.java       |  3 ++
 .../plugins/modem/ModemPluginTest.java        | 12 +++--
 .../plugins/tcp/LanTcpClientTest.java         | 10 ++--
 .../plugins/tcp/LanTcpPluginTest.java         | 21 +++++----
 .../plugins/tcp/LanTcpServerTest.java         |  8 ++--
 .../system/LinuxSeedProviderTest.java         | 22 ++++-----
 .../transport/KeyManagerImplTest.java         | 15 +++---
 .../transport/KeyRotationIntegrationTest.java | 17 ++++---
 .../transport/ReorderingWindowTest.java       | 14 ++++--
 .../transport/StreamReaderImplTest.java       |  5 +-
 .../transport/StreamWriterImplTest.java       |  5 +-
 .../transport/TestStreamDecrypter.java        | 12 ++---
 .../transport/TestStreamEncrypter.java        | 10 ++--
 .../transport/TransportIntegrationTest.java   | 15 +++---
 .../transport/TransportTagRecogniserTest.java | 13 ++++--
 .../org/briarproject/util/ByteUtilsTest.java  |  2 +
 .../briarproject/util/StringUtilsTest.java    |  6 ++-
 66 files changed, 440 insertions(+), 338 deletions(-)

diff --git a/briar-tests/src/org/briarproject/BriarTestCase.java b/briar-tests/src/org/briarproject/BriarTestCase.java
index a26508b8fd..4f97947d51 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 30da3436b6..7daaf557e0 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 557d4a990b..ce87ecd768 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 285a6c42a5..e4efc42047 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 8cff99d56f..263ec20c2f 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 e81b16bde3..78a02ff818 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 580b445e2b..a6b6a61863 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 af9d137b3c..4249a809f4 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 aefeeda5c9..2169dcddd0 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 1015deb9ec..9734f533e0 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 861c866d85..aeae21eeb5 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 c3f2dd1853..6ee9690895 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 84f2ca3c88..a9b10b0b9e 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 b3f92a65c7..9946ea4640 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 b464729f31..260c38cd85 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 ae8860b687..f4bfa8cd60 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 631d0a44f3..0e3c80a71d 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 5a78c0cc86..b380dee527 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 cdc59b3323..e8fc10ce7c 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 5407daf9ae..249ed4a165 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 44c61fdee6..947c4bee12 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 7e960613f8..7d7acd74d9 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 da9276279b..e5ac76f7aa 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 7697bdd77a..cfacd0c51c 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 9ddcd6dec7..a8b95543b7 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 093680f3b5..2e9bf43e22 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 f694e90c7c..79e79fd2db 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 645ce2fb18..2e94aa96a3 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 f758e8c9e0..2fb80dd065 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 ec21e4c6c0..5aff9c74ab 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 6b6942d269..3af216ebf4 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 53b5623963..a4156c6d1b 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 eb19901e5e..a96bdaee4c 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 c1c404c8ba..cdcb406c17 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 fcacc16c8a..3850d0494c 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 d6002c609e..2c43be177e 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 fa13af5102..e618c3ec43 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 b2237b57f1..a31d912401 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 2646dfec7e..e36624a5dd 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 28bfadea20..ba73b0ace3 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 ac5a45e5b0..5d54e12c1f 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 8dab883cb7..5493a0178b 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 d99ac2d56a..fdf768548e 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 121f71b403..671a0a413e 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 d79fad795e..6505284e7a 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 f9156c9136..43e9910418 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 cfaf60c2c3..69e5595251 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 5ae0bbb503..f4326e9e68 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 8d882679b8..06ac33bfc8 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 29786b4432..235b6e8067 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 7966ef8c48..f186355b52 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 9f7a577402..ac6bfb305a 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 fa609ecf8a..b929c8f528 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 7531978148..3a48a71c96 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 ff03eaccf3..4a8f9ab160 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 51493518c9..210bd4b97b 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 b5bcaa5b21..72ec029dd6 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 db802cd1d8..e0d567069f 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 7e9e97bb2f..c186400cf6 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 5512f7bd45..6bf6e9dff3 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 a327bdaa9c..9d06e52a4f 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 9034810183..6aa4c80684 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 b4922bdea6..b373970611 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 94bdd86365..d6287599f7 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 24e9610170..0df6548bd6 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 0d3b331ade..9ac929b3a3 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
-- 
GitLab