Skip to content
Snippets Groups Projects
Verified Commit 88a799df authored by akwizgran's avatar akwizgran
Browse files

Rename some classes that don't involve JDBC.

parent 4bb726ac
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 16 deletions
......@@ -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.UTest.Z_CRITICAL_0_01;
public abstract class JdbcDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceTest {
public abstract class DatabasePerformanceComparisonTest
extends DatabasePerformanceTest {
/**
* How many blocks of each condition to compare.
......
......@@ -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.junit.Assert.assertTrue;
public abstract class JdbcDatabasePerformanceTest extends BrambleTestCase {
public abstract class DatabasePerformanceTest extends BrambleTestCase {
private static final int ONE_MEGABYTE = 1024 * 1024;
static final int MAX_SIZE = 100 * ONE_MEGABYTE;
......
......@@ -17,8 +17,7 @@ import javax.annotation.Nullable;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
public abstract class JdbcDatabaseTraceTest
extends JdbcDatabasePerformanceTest {
public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
Clock clock);
......
......@@ -5,8 +5,7 @@ import org.briarproject.bramble.api.system.Clock;
import org.junit.Ignore;
@Ignore
public class H2DatabasePerformanceTest
extends JdbcSingleDatabasePerformanceTest {
public class H2DatabasePerformanceTest extends SingleDatabasePerformanceTest {
@Override
protected String getTestName() {
......
......@@ -10,7 +10,7 @@ import java.sql.Connection;
import javax.annotation.Nonnull;
@Ignore
public class H2DatabaseTraceTest extends JdbcDatabaseTraceTest {
public class H2DatabaseTraceTest extends DatabaseTraceTest {
@Override
Database<Connection> createDatabase(DatabaseConfig databaseConfig,
......
......@@ -8,7 +8,7 @@ import java.sql.Connection;
@Ignore
public class H2HyperSqlDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest {
extends DatabasePerformanceComparisonTest {
@Override
Database<Connection> createDatabase(boolean conditionA,
......
......@@ -7,13 +7,13 @@ import org.junit.Ignore;
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)
* detected.
*/
@Ignore
public class H2SelfDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest {
extends DatabasePerformanceComparisonTest {
@Override
Database<Connection> createDatabase(boolean conditionA,
......
......@@ -9,13 +9,13 @@ import org.junit.Ignore;
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
* considered to be faster.
*/
@Ignore
public class H2SleepDatabasePerformanceComparisonTest
extends JdbcDatabasePerformanceComparisonTest {
extends DatabasePerformanceComparisonTest {
@Override
Database<Connection> createDatabase(boolean conditionA,
......
......@@ -6,7 +6,7 @@ import org.junit.Ignore;
@Ignore
public class HyperSqlDatabasePerformanceTest
extends JdbcSingleDatabasePerformanceTest {
extends SingleDatabasePerformanceTest {
@Override
protected String getTestName() {
......
......@@ -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.getStandardDeviation;
public abstract class JdbcSingleDatabasePerformanceTest
extends JdbcDatabasePerformanceTest {
public abstract class SingleDatabasePerformanceTest
extends DatabasePerformanceTest {
abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
Clock clock);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment