master: Introducing MutedLogAsserter; fixed a few test mishaps

Totaal-Software · Mar 15, 2018 · 55779e6 · 55779e6
1 parent 3cb2beb
commit 55779e6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/test-log4j/src/test/java/testlog/Log4jLogAsserterTest.java b/test-log4j/src/test/java/testlog/Log4jLogAsserterTest.java
@@ -40,6 +40,11 @@ protected CaptureInfoAppender createAppender() {
         return new Log4jCaptureInfoAppender();
     }
 
+    @Override
+    protected boolean isMuted() {
+        return false;
+    }
+
     @Override
     protected void enableTraceLogging() {
         getRootLogger().setLevel(org.apache.log4j.Level.TRACE);

diff --git a/test-log4j/src/test/java/testlog/Log4jMutedLogAsserterAsserterTest.java b/test-log4j/src/test/java/testlog/Log4jMutedLogAsserterAsserterTest.java
@@ -23,6 +23,11 @@ protected LogAsserter callLogAsserterConstructor(Level level) {
 
     @Override
     protected LogAsserter callSubjectSetUpLogAsserter(Level level) {
-        return MutedLogAsserter.setUpLogAsserter(level);
+        return MutedLogAsserter.setupMutedLogAsserter(level);
+    }
+
+    @Override
+    protected boolean isMuted() {
+        return true;
     }
 }
diff --git a/test-logback/src/test/java/testlog/LogbackLogAsserterTest.java b/test-logback/src/test/java/testlog/LogbackLogAsserterTest.java
@@ -46,6 +46,11 @@ protected void enableTraceLogging() {
         getRootLogger().setLevel(ch.qos.logback.classic.Level.TRACE);
     }
 
+    @Override
+    protected boolean isMuted() {
+        return false;
+    }
+
     private static class LogbackCaptureInfoAppender extends AppenderBase<ILoggingEvent> implements CaptureInfoAppender {
         private List<String> messages = new ArrayList<>();
 

diff --git a/test-logback/src/test/java/testlog/LogbackMutedLogAsserterAsserterTest.java b/test-logback/src/test/java/testlog/LogbackMutedLogAsserterAsserterTest.java
@@ -23,6 +23,11 @@ protected LogAsserter callLogAsserterConstructor(Level level) {
 
     @Override
     protected LogAsserter callSubjectSetUpLogAsserter(Level level) {
-        return MutedLogAsserter.setUpLogAsserter(level);
+        return MutedLogAsserter.setupMutedLogAsserter(level);
+    }
+
+    @Override
+    protected boolean isMuted() {
+        return true;
     }
 }
diff --git a/test-shared/src/main/java/testlog/AbstractLogAsserterTest.java b/test-shared/src/main/java/testlog/AbstractLogAsserterTest.java
@@ -157,7 +157,11 @@ public void testLogInfoForExpectedLog() {
         logger.error("error statement");
 
         subject.tearDown();
-        appender.assertMessages("allowed log at level ERROR: error statement");
+        if (isMuted()) {
+            appender.assertMessages(/* empty */);
+        } else {
+            appender.assertMessages("allowed log at level ERROR: error statement");
+        }
         appender.unregister();
     }
 
@@ -341,6 +345,8 @@ public void testWithAlsoLogBelowMinimumLevel() {
 
     protected abstract void enableTraceLogging();
 
+    protected abstract boolean isMuted();
+
     private CaptureInfoAppender registerAppender() {
         CaptureInfoAppender appender = createAppender();
         appender.register();