From 941a0cccc3e08149bdcf0a8b890a649419251e47 Mon Sep 17 00:00:00 2001 From: goapunk <goapunk@riseup.net> Date: Wed, 15 Aug 2018 14:53:35 +0200 Subject: [PATCH] Fix a regression in the performance tests causing the db key to be regenerated everytime. --- .../bramble/db/DatabasePerformanceComparisonTest.java | 4 +++- .../java/org/briarproject/bramble/db/DatabaseTraceTest.java | 5 ++++- .../bramble/db/SingleDatabasePerformanceTest.java | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java index 279d1b56e6..3f5657d11d 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.db; +import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.system.Clock; @@ -26,6 +27,7 @@ public abstract class DatabasePerformanceComparisonTest * How many blocks of each condition to compare. */ private static final int COMPARISON_BLOCKS = 10; + private SecretKey databaseKey = getSecretKey(); abstract Database<Connection> createDatabase(boolean conditionA, DatabaseConfig databaseConfig, Clock clock); @@ -72,7 +74,7 @@ public abstract class DatabasePerformanceComparisonTest throws DbException { Database<Connection> db = createDatabase(conditionA, new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock()); - db.open(getSecretKey(), null); + db.open(databaseKey, null); return db; } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java index 2060ca71ec..cf90b7fd09 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.db; +import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.system.Clock; @@ -20,6 +21,8 @@ import static org.briarproject.bramble.test.TestUtils.getSecretKey; public abstract class DatabaseTraceTest extends DatabasePerformanceTest { + private SecretKey databaseKey = getSecretKey(); + abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig, Clock clock); @@ -44,7 +47,7 @@ public abstract class DatabaseTraceTest extends DatabasePerformanceTest { private Database<Connection> openDatabase() throws DbException { Database<Connection> db = createDatabase( new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock()); - db.open(getSecretKey(), null); + db.open(databaseKey, null); return db; } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java index 6256d39cd0..1b93b1f1e3 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.db; +import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.system.Clock; @@ -22,6 +23,8 @@ public abstract class SingleDatabasePerformanceTest abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig, Clock clock); + private SecretKey databaseKey = getSecretKey(); + @Override protected void benchmark(String name, BenchmarkTask<Database<Connection>> task) throws Exception { @@ -41,7 +44,7 @@ public abstract class SingleDatabasePerformanceTest private Database<Connection> openDatabase() throws DbException { Database<Connection> db = createDatabase( new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock()); - db.open(getSecretKey(), null); + db.open(databaseKey, null); return db; } -- GitLab