From 7f6b31d36c72cb7ff00b78af24642c787403eec8 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 30 Mar 2022 16:54:11 +0100 Subject: [PATCH] Don't warn about background exceptions unless one was thrown. --- .../briarproject/bramble/test/BrambleTestCase.java | 12 ++++++++---- 1 file changed, 8 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 9ac8a7a40..786cbc0ed 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 @@ -4,11 +4,11 @@ import org.junit.After; import org.junit.Before; import java.lang.Thread.UncaughtExceptionHandler; -import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nullable; +import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; public abstract class BrambleTestCase { @@ -22,7 +22,7 @@ public abstract class BrambleTestCase { public BrambleTestCase() { // Ensure exceptions thrown on worker threads cause tests to fail UncaughtExceptionHandler fail = (thread, throwable) -> { - LOG.log(Level.WARNING, "Caught unhandled exception", throwable); + LOG.log(WARNING, "Caught unhandled exception", throwable); exceptionInBackgroundThread = throwable; }; Thread.setDefaultUncaughtExceptionHandler(fail); @@ -36,7 +36,11 @@ public abstract class BrambleTestCase { @After public void afterBrambleTestCase() { Throwable thrown = exceptionInBackgroundThread; - LOG.warning("background thread has thrown an exception unexpectedly"); - if (thrown != null) throw new AssertionError(thrown); + if (thrown != null) { + LOG.log(WARNING, + "Background thread has thrown an exception unexpectedly", + thrown); + throw new AssertionError(thrown); + } } }