Rename some classes that don't involve JDBC.

This commit is contained in:
akwizgran
2017-12-12 16:18:25 +00:00
parent 4bb726ac9a
commit 88a799df45
10 changed files with 14 additions and 16 deletions

View File

@@ -18,8 +18,8 @@ import static org.briarproject.bramble.test.TestUtils.getMedian;
import static org.briarproject.bramble.test.TestUtils.getStandardDeviation; import static org.briarproject.bramble.test.TestUtils.getStandardDeviation;
import static org.briarproject.bramble.test.UTest.Z_CRITICAL_0_01; import static org.briarproject.bramble.test.UTest.Z_CRITICAL_0_01;
public abstract class JdbcDatabasePerformanceComparisonTest public abstract class DatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceTest { extends DatabasePerformanceTest {
/** /**
* How many blocks of each condition to compare. * How many blocks of each condition to compare.

View File

@@ -45,7 +45,7 @@ import static org.briarproject.bramble.test.UTest.Z_CRITICAL_0_1;
import static org.briarproject.bramble.util.StringUtils.getRandomString; import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public abstract class JdbcDatabasePerformanceTest extends BrambleTestCase { public abstract class DatabasePerformanceTest extends BrambleTestCase {
private static final int ONE_MEGABYTE = 1024 * 1024; private static final int ONE_MEGABYTE = 1024 * 1024;
static final int MAX_SIZE = 100 * ONE_MEGABYTE; static final int MAX_SIZE = 100 * ONE_MEGABYTE;

View File

@@ -17,8 +17,7 @@ import javax.annotation.Nullable;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
public abstract class JdbcDatabaseTraceTest public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
extends JdbcDatabasePerformanceTest {
abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig, abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
Clock clock); Clock clock);

View File

@@ -5,8 +5,7 @@ import org.briarproject.bramble.api.system.Clock;
import org.junit.Ignore; import org.junit.Ignore;
@Ignore @Ignore
public class H2DatabasePerformanceTest public class H2DatabasePerformanceTest extends SingleDatabasePerformanceTest {
extends JdbcSingleDatabasePerformanceTest {
@Override @Override
protected String getTestName() { protected String getTestName() {

View File

@@ -10,7 +10,7 @@ import java.sql.Connection;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@Ignore @Ignore
public class H2DatabaseTraceTest extends JdbcDatabaseTraceTest { public class H2DatabaseTraceTest extends DatabaseTraceTest {
@Override @Override
Database<Connection> createDatabase(DatabaseConfig databaseConfig, Database<Connection> createDatabase(DatabaseConfig databaseConfig,

View File

@@ -8,7 +8,7 @@ import java.sql.Connection;
@Ignore @Ignore
public class H2HyperSqlDatabasePerformanceComparisonTest public class H2HyperSqlDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest { extends DatabasePerformanceComparisonTest {
@Override @Override
Database<Connection> createDatabase(boolean conditionA, Database<Connection> createDatabase(boolean conditionA,

View File

@@ -7,13 +7,13 @@ import org.junit.Ignore;
import java.sql.Connection; import java.sql.Connection;
/** /**
* Sanity check for {@link JdbcDatabasePerformanceComparisonTest}: check that * Sanity check for {@link DatabasePerformanceComparisonTest}: check that
* if conditions A and B are identical, no significant difference is (usually) * if conditions A and B are identical, no significant difference is (usually)
* detected. * detected.
*/ */
@Ignore @Ignore
public class H2SelfDatabasePerformanceComparisonTest public class H2SelfDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest { extends DatabasePerformanceComparisonTest {
@Override @Override
Database<Connection> createDatabase(boolean conditionA, Database<Connection> createDatabase(boolean conditionA,

View File

@@ -9,13 +9,13 @@ import org.junit.Ignore;
import java.sql.Connection; import java.sql.Connection;
/** /**
* Sanity check for {@link JdbcDatabasePerformanceComparisonTest}: check that * Sanity check for {@link DatabasePerformanceComparisonTest}: check that
* if condition B sleeps for 1ms before every commit, condition A is * if condition B sleeps for 1ms before every commit, condition A is
* considered to be faster. * considered to be faster.
*/ */
@Ignore @Ignore
public class H2SleepDatabasePerformanceComparisonTest public class H2SleepDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest { extends DatabasePerformanceComparisonTest {
@Override @Override
Database<Connection> createDatabase(boolean conditionA, Database<Connection> createDatabase(boolean conditionA,

View File

@@ -6,7 +6,7 @@ import org.junit.Ignore;
@Ignore @Ignore
public class HyperSqlDatabasePerformanceTest public class HyperSqlDatabasePerformanceTest
extends JdbcSingleDatabasePerformanceTest { extends SingleDatabasePerformanceTest {
@Override @Override
protected String getTestName() { protected String getTestName() {

View File

@@ -15,8 +15,8 @@ import static org.briarproject.bramble.test.TestUtils.getMean;
import static org.briarproject.bramble.test.TestUtils.getMedian; import static org.briarproject.bramble.test.TestUtils.getMedian;
import static org.briarproject.bramble.test.TestUtils.getStandardDeviation; import static org.briarproject.bramble.test.TestUtils.getStandardDeviation;
public abstract class JdbcSingleDatabasePerformanceTest public abstract class SingleDatabasePerformanceTest
extends JdbcDatabasePerformanceTest { extends DatabasePerformanceTest {
abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig, abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
Clock clock); Clock clock);