From 0a7b810fcea599e98da429824fbe110f3909fe6c Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 15 Dec 2017 15:43:33 +0000
Subject: [PATCH] Disable logging for DB performance tests only.
---
.../org/briarproject/bramble/test/BrambleTestCase.java | 4 ----
.../briarproject/bramble/db/DatabasePerformanceTest.java | 7 +++++++
2 files changed, 7 insertions(+), 4 deletions(-)
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 4467f2f470..9fae780434 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 840af855c3..7cde0a2333 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());
--
GitLab