diff --git a/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java index 4467f2f4704c837060d8ecbe9321e01631c34e06..9fae780434640f1dbf9132a64135b48881108324 100644 --- a/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java +++ b/bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java @@ -1,9 +1,7 @@ package org.briarproject.bramble.test; import java.lang.Thread.UncaughtExceptionHandler; -import java.util.logging.Logger; -import static java.util.logging.Level.OFF; import static org.junit.Assert.fail; public abstract class BrambleTestCase { @@ -15,7 +13,5 @@ public abstract class BrambleTestCase { fail(); }; Thread.setDefaultUncaughtExceptionHandler(fail); - // Disable logging - Logger.getLogger("").setLevel(OFF); } } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java index 840af855c386e1f666d56b6b1d69b9158478f76b..7cde0a2333554c67e9f6c2988c3d0cb53c1a72c4 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java @@ -29,7 +29,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; +import java.util.logging.Logger; +import static java.util.logging.Level.OFF; import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_IDS; import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; @@ -112,6 +114,11 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase { protected abstract void benchmark(String name, BenchmarkTask<Database<Connection>> task) throws Exception; + DatabasePerformanceTest() { + // Disable logging + Logger.getLogger("").setLevel(OFF); + } + @Before public void setUp() { assertTrue(testDir.mkdirs());