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

Don't mix JUnit 4 annotations with JUnit3 TestCase.

Browse Source
This commit is contained in:
akwizgran
2015-12-08 14:53:50 +00:00
parent 9158514abf
commit 123dff3a3d
66 changed files with 440 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {