Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +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

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