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

Folded ReadWriteLockDatabaseComponentTest into its parent.

Browse Source
This commit is contained in:
akwizgran
2011-09-19 14:58:32 +01:00
parent 22b8321376
commit bf01dd4f96
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/build.xml
View File

@@ -20,8 +20,8 @@
<test name='net.sf.briar.crypto.SharedSecretTest'/> <test name='net.sf.briar.crypto.SharedSecretTest'/>
<test name='net.sf.briar.db.BasicH2Test'/> <test name='net.sf.briar.db.BasicH2Test'/>
<test name='net.sf.briar.db.DatabaseCleanerImplTest'/> <test name='net.sf.briar.db.DatabaseCleanerImplTest'/>
<test name='net.sf.briar.db.DatabaseComponentImplTest'/>
<test name='net.sf.briar.db.H2DatabaseTest'/> <test name='net.sf.briar.db.H2DatabaseTest'/>
<test name='net.sf.briar.db.ReadWriteLockDatabaseComponentTest'/>
<test name='net.sf.briar.i18n.FontManagerTest'/> <test name='net.sf.briar.i18n.FontManagerTest'/>
<test name='net.sf.briar.i18n.I18nTest'/> <test name='net.sf.briar.i18n.I18nTest'/>
<test name='net.sf.briar.invitation.InvitationWorkerTest'/> <test name='net.sf.briar.invitation.InvitationWorkerTest'/>

16
test/net/sf/briar/db/DatabaseComponentImplTest.java
View File

@@ -5,6 +5,7 @@ import static net.sf.briar.api.db.DatabaseComponent.MIN_FREE_SPACE;
import java.util.Collections; import java.util.Collections;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException; import net.sf.briar.api.db.DbException;
import net.sf.briar.db.DatabaseCleaner.Callback; import net.sf.briar.db.DatabaseCleaner.Callback;
@@ -16,10 +17,7 @@ import org.junit.Test;
* Tests that use the DatabaseCleaner.Callback interface of * Tests that use the DatabaseCleaner.Callback interface of
* DatabaseComponentImpl. * DatabaseComponentImpl.
*/ */
public abstract class DatabaseComponentImplTest extends DatabaseComponentTest { public class DatabaseComponentImplTest extends DatabaseComponentTest {
protected abstract <T> DatabaseComponentImpl<T> createDatabaseComponentImpl(
Database<T> database, DatabaseCleaner cleaner);
@Test @Test
public void testNotCleanedIfEnoughFreeSpace() throws DbException { public void testNotCleanedIfEnoughFreeSpace() throws DbException {
@@ -120,4 +118,14 @@ public abstract class DatabaseComponentImplTest extends DatabaseComponentTest {
context.assertIsSatisfied(); context.assertIsSatisfied();
} }
protected <T> DatabaseComponent createDatabaseComponent(
Database<T> database, DatabaseCleaner cleaner) {
return createDatabaseComponentImpl(database, cleaner);
}
private <T> DatabaseComponentImpl<T> createDatabaseComponentImpl(
Database<T> database, DatabaseCleaner cleaner) {
return new ReadWriteLockDatabaseComponent<T>(database, cleaner);
}
} }

19
test/net/sf/briar/db/ReadWriteLockDatabaseComponentTest.java
View File

@@ -1,19 +0,0 @@
package net.sf.briar.db;
import net.sf.briar.api.db.DatabaseComponent;
public class ReadWriteLockDatabaseComponentTest
extends DatabaseComponentImplTest {
@Override
protected <T> DatabaseComponent createDatabaseComponent(
Database<T> database, DatabaseCleaner cleaner) {
return createDatabaseComponentImpl(database, cleaner);
}
@Override
protected <T> DatabaseComponentImpl<T> createDatabaseComponentImpl(
Database<T> database, DatabaseCleaner cleaner) {
return new ReadWriteLockDatabaseComponent<T>(database, cleaner);
}
}