Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'junit-4-not-3' into 'master'

Browse Source 
Don't mix JUnit 4's @Test with JUnit3's TestCase.

This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.

Most of the changes come from Android Studio organising imports in a different order from Eclipse.

See merge request !8
This commit is contained in:
akwizgran
2015-12-09 13:23:42 +00:00
parent a5afa2ef93 123dff3a3d
commit d0342f9a4e
66 changed files with 440 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-tests/src/org/briarproject/BriarTestCase.java
View File

@@ -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

7
briar-tests/src/org/briarproject/LockFairnessTest.java
View File

@@ -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 {

29
briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
View File

@@ -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 {

4
briar-tests/src/org/briarproject/TestDatabaseConfig.java
View File

@@ -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;

4
briar-tests/src/org/briarproject/TestDatabaseModule.java
View File

@@ -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 {

8
briar-tests/src/org/briarproject/TestFileUtils.java
View File

@@ -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();
}
}

8
briar-tests/src/org/briarproject/TestLifecycleModule.java
View File

@@ -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 {

6
briar-tests/src/org/briarproject/TestMessage.java
View File

@@ -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;

4
briar-tests/src/org/briarproject/TestSeedProvider.java
View File

@@ -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();

4
briar-tests/src/org/briarproject/TestSystemModule.java
View File

@@ -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() {

4
briar-tests/src/org/briarproject/TestUtils.java
View File

@@ -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 =

11
briar-tests/src/org/briarproject/crypto/EllipticCurveMultiplicationTest.java
View File

@@ -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

14
briar-tests/src/org/briarproject/crypto/EllipticCurvePerformanceTest.java
View File

@@ -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 {

5
briar-tests/src/org/briarproject/crypto/FortunaGeneratorTest.java
View File

@@ -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

11
briar-tests/src/org/briarproject/crypto/FortunaSecureRandomTest.java
View File

@@ -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

4
briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java
View File

@@ -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

12
briar-tests/src/org/briarproject/crypto/KeyDerivationTest.java
View File

@@ -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;

11
briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java
View File

@@ -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 =

11
briar-tests/src/org/briarproject/crypto/PasswordBasedKdfTest.java
View File

@@ -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 =

5
briar-tests/src/org/briarproject/crypto/PasswordStrengthEstimatorImplTest.java
View File

@@ -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

15
briar-tests/src/org/briarproject/crypto/StreamEncrypterImplTest.java
View File

@@ -1,16 +1,17 @@
package org.briarproject.crypto;
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.SecretKey;
import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.util.Random;
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 java.io.ByteArrayOutputStream;
import java.util.Random;
import org.briarproject.BriarTestCase;
import org.briarproject.api.crypto.SecretKey;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class StreamEncrypterImplTest extends BriarTestCase {

4
briar-tests/src/org/briarproject/crypto/TestAuthenticatedCipher.java
View File

@@ -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 {

26
briar-tests/src/org/briarproject/data/ReaderImplTest.java
View File

@@ -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());
}

13
briar-tests/src/org/briarproject/data/WriterImplTest.java
View File

@@ -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();

17
briar-tests/src/org/briarproject/db/BasicH2Test.java
View File

@@ -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 {

6
briar-tests/src/org/briarproject/db/DatabaseCleanerImplTest.java
View File

@@ -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

10
briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java
View File

@@ -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.

21
briar-tests/src/org/briarproject/db/DatabaseComponentTest.java
View File

@@ -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();

2
briar-tests/src/org/briarproject/db/ExponentialBackoffTest.java
View File

@@ -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;

46
briar-tests/src/org/briarproject/db/H2DatabaseTest.java
View File

@@ -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);

9
briar-tests/src/org/briarproject/lifecycle/ShutdownManagerImplTest.java
View File

@@ -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

3
briar-tests/src/org/briarproject/lifecycle/WindowsShutdownManagerImplTest.java
View File

@@ -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

37
briar-tests/src/org/briarproject/messaging/ConstantsTest.java
View File

@@ -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 {

12
briar-tests/src/org/briarproject/messaging/ConsumersTest.java
View File

@@ -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

26
briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
View File

@@ -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 {

32
briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
View File

@@ -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);

6
briar-tests/src/org/briarproject/messaging/SimplexOutgoingSessionTest.java
View File

@@ -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;

12
briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java
View File

@@ -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;

10
briar-tests/src/org/briarproject/plugins/DuplexClientTest.java
View File

@@ -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;

12
briar-tests/src/org/briarproject/plugins/DuplexServerTest.java
View File

@@ -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;

10
briar-tests/src/org/briarproject/plugins/DuplexTest.java
View File

@@ -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!";

10
briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java
View File

@@ -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

12
briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothClientTest.java
View File

@@ -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 {

10
briar-tests/src/org/briarproject/plugins/bluetooth/BluetoothServerTest.java
View File

@@ -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 {

2
briar-tests/src/org/briarproject/plugins/file/LinuxRemovableDriveFinderTest.java
View File

@@ -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

2
briar-tests/src/org/briarproject/plugins/file/MacRemovableDriveFinderTest.java
View File

@@ -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

11
briar-tests/src/org/briarproject/plugins/file/PollingRemovableDriveMonitorTest.java
View File

@@ -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 {

27
briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
View File

@@ -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);

19
briar-tests/src/org/briarproject/plugins/file/UnixRemovableDriveMonitorTest.java
View File

@@ -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();

3
briar-tests/src/org/briarproject/plugins/modem/CountryCodesTest.java
View File

@@ -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

12
briar-tests/src/org/briarproject/plugins/modem/ModemPluginTest.java
View File

@@ -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";

10
briar-tests/src/org/briarproject/plugins/tcp/LanTcpClientTest.java
View File

@@ -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 {

21
briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java
View File

@@ -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 {

8
briar-tests/src/org/briarproject/plugins/tcp/LanTcpServerTest.java
View File

@@ -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 {

22
briar-tests/src/org/briarproject/system/LinuxSeedProviderTest.java
View File

@@ -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);

15
briar-tests/src/org/briarproject/transport/KeyManagerImplTest.java
View File

@@ -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;

17
briar-tests/src/org/briarproject/transport/KeyRotationIntegrationTest.java
View File

@@ -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;

14
briar-tests/src/org/briarproject/transport/ReorderingWindowTest.java
View File

@@ -1,13 +1,17 @@
package org.briarproject.transport;
import org.briarproject.BriarTestCase;
import org.junit.Test;
import java.util.Collection;
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 java.util.Collection;
import org.briarproject.BriarTestCase;
import org.junit.Test;
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 {

5
briar-tests/src/org/briarproject/transport/StreamReaderImplTest.java
View File

@@ -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

5
briar-tests/src/org/briarproject/transport/StreamWriterImplTest.java
View File

@@ -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

12
briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java
View File

@@ -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 {

10
briar-tests/src/org/briarproject/transport/TestStreamEncrypter.java
View File

@@ -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 {

15
briar-tests/src/org/briarproject/transport/TransportIntegrationTest.java
View File

@@ -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 {

13
briar-tests/src/org/briarproject/transport/TransportTagRecogniserTest.java
View File

@@ -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);

2
briar-tests/src/org/briarproject/util/ByteUtilsTest.java
View File

@@ -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

6
briar-tests/src/org/briarproject/util/StringUtilsTest.java
View File

@@ -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