Merge pull request #19947 from stuartwdouglas/fix-log-assert

Fix log assertions
quarkusio · Sep 7, 2021 · d62b296 · d62b296
2 parents 154475c + 31138b0
commit d62b296
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -572,8 +572,9 @@ private Throwable unwrapException(Throwable cause) {
     public void afterAll(ExtensionContext extensionContext) throws Exception {
         actualTestClass = null;
         actualTestInstance = null;
+        List<LogRecord> records = null;
         if (assertLogRecords != null) {
-            assertLogRecords.accept(inMemoryLogHandler.records);
+            records = new ArrayList<>(inMemoryLogHandler.records);
         }
         rootLogger.setHandlers(originalHandlers);
         inMemoryLogHandler.clearRecords();
@@ -606,9 +607,12 @@ public void afterAll(ExtensionContext extensionContext) throws Exception {
             if (afterAllCustomizer != null) {
                 afterAllCustomizer.run();
             }
+            ClearCache.clearAnnotationCache();
+            GroovyCacheCleaner.clearGroovyCache();
+        }
+        if (records != null) {
+            assertLogRecords.accept(records);
         }
-        ClearCache.clearAnnotationCache();
-        GroovyCacheCleaner.clearGroovyCache();
     }
 
     @Override