Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-exception-logging' into 'master'

Browse Source 
Don't warn about background exceptions unless one was thrown

See merge request briar/briar!1610
This commit is contained in:
akwizgran
2022-04-01 11:15:33 +00:00
parent bf968b227e 7f6b31d36c
commit cc9f04980a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java
View File

@@ -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);
}
}
}