From 88a799df4545b5f0d2c6cf6cdfee24b722df28bd Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 12 Dec 2017 16:18:25 +0000
Subject: [PATCH] Rename some classes that don't involve JDBC.
---
...arisonTest.java => DatabasePerformanceComparisonTest.java} | 4 ++--
...abasePerformanceTest.java => DatabasePerformanceTest.java} | 2 +-
.../db/{JdbcDatabaseTraceTest.java => DatabaseTraceTest.java} | 3 +--
.../briarproject/bramble/db/H2DatabasePerformanceTest.java | 3 +--
.../java/org/briarproject/bramble/db/H2DatabaseTraceTest.java | 2 +-
.../db/H2HyperSqlDatabasePerformanceComparisonTest.java | 2 +-
.../bramble/db/H2SelfDatabasePerformanceComparisonTest.java | 4 ++--
.../bramble/db/H2SleepDatabasePerformanceComparisonTest.java | 4 ++--
.../bramble/db/HyperSqlDatabasePerformanceTest.java | 2 +-
...erformanceTest.java => SingleDatabasePerformanceTest.java} | 4 ++--
10 files changed, 14 insertions(+), 16 deletions(-)
rename bramble-core/src/test/java/org/briarproject/bramble/db/{JdbcDatabasePerformanceComparisonTest.java => DatabasePerformanceComparisonTest.java} (96%)
rename bramble-core/src/test/java/org/briarproject/bramble/db/{JdbcDatabasePerformanceTest.java => DatabasePerformanceTest.java} (99%)
rename bramble-core/src/test/java/org/briarproject/bramble/db/{JdbcDatabaseTraceTest.java => DatabaseTraceTest.java} (95%)
rename bramble-core/src/test/java/org/briarproject/bramble/db/{JdbcSingleDatabasePerformanceTest.java => SingleDatabasePerformanceTest.java} (95%)
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
similarity index 96%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
index ea8710bafb..c2a124bb29 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
@@ -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.
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
similarity index 99%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
index ffb6ed965d..840af855c3 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java
@@ -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;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
similarity index 95%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
index 3fb2d43426..a78fb5f55a 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTraceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
@@ -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);
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
index 61397559e6..fdac3e58c9 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java
@@ -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() {
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
index 885613d4dc..2b12f88b03 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java
@@ -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,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
index c83675713b..b51cca72a8 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java
@@ -8,7 +8,7 @@ import java.sql.Connection;
@Ignore
public class H2HyperSqlDatabasePerformanceComparisonTest
- extends JdbcDatabasePerformanceComparisonTest {
+ extends DatabasePerformanceComparisonTest {
@Override
Database<Connection> createDatabase(boolean conditionA,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
index a7c483512c..4fb686043f 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java
@@ -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,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
index 4bc215c28b..73d382bc51 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java
@@ -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,
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
index 29585d5c9f..39c69f3d79 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java
@@ -6,7 +6,7 @@ import org.junit.Ignore;
@Ignore
public class HyperSqlDatabasePerformanceTest
- extends JdbcSingleDatabasePerformanceTest {
+ extends SingleDatabasePerformanceTest {
@Override
protected String getTestName() {
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
similarity index 95%
rename from bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java
rename to bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
index 2356d9346a..5a83647678 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcSingleDatabasePerformanceTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
@@ -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);
--
GitLab