Avoid config leaking in logback unit tests.

Author: phipag

powertools-logging/powertools-logging-log4j/src/test/java/software/amazon/lambda/powertools/logging/log4j/internal/Log4jLoggingManagerTest.java

@@ -78,38 +78,30 @@ void shouldDetectMultipleBufferingAppendersRegardlessOfName() throws IOException
         }
 
         LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        Configuration originalConfig = ctx.getConfiguration();
+        ConfigurationFactory factory = new XmlConfigurationFactory();
+        ConfigurationSource source = new ConfigurationSource(
+                getClass().getResourceAsStream("/log4j2-multiple-buffering.xml"));
+        Configuration config = factory.getConfiguration(null, source);
 
-        try {
-            ConfigurationFactory factory = new XmlConfigurationFactory();
-            ConfigurationSource source = new ConfigurationSource(
-                    getClass().getResourceAsStream("/log4j2-multiple-buffering.xml"));
-            Configuration config = factory.getConfiguration(null, source);
-
-            ctx.setConfiguration(config);
-            ctx.updateLoggers();
-
-            org.apache.logging.log4j.Logger logger = LogManager.getLogger("test.multiple.appenders");
-
-            // When - log messages and flush buffers
-            logger.debug("Test message 1");
-            logger.debug("Test message 2");
-
-            Log4jLoggingManager manager = new Log4jLoggingManager();
-            manager.flushBuffer();
-
-            // Then - both appenders should have flushed their buffers
-            File logFile = new File("target/logfile.json");
-            assertThat(logFile).exists();
-            String content = contentOf(logFile);
-            // Each message should appear twice (once from each BufferingAppender)
-            assertThat(content.split("Test message 1", -1)).hasSize(3); // 2 occurrences = 3 parts
-            assertThat(content.split("Test message 2", -1)).hasSize(3); // 2 occurrences = 3 parts
-        } finally {
-            // Restore original configuration to prevent test interference
-            ctx.setConfiguration(originalConfig);
-            ctx.updateLoggers();
-        }
+        ctx.setConfiguration(config);
+        ctx.updateLoggers();
+
+        org.apache.logging.log4j.Logger logger = LogManager.getLogger("test.multiple.appenders");
+
+        // When - log messages and flush buffers
+        logger.debug("Test message 1");
+        logger.debug("Test message 2");
+
+        Log4jLoggingManager manager = new Log4jLoggingManager();
+        manager.flushBuffer();
+
+        // Then - both appenders should have flushed their buffers
+        File logFile = new File("target/logfile.json");
+        assertThat(logFile).exists();
+        String content = contentOf(logFile);
+        // Each message should appear twice (once from each BufferingAppender)
+        assertThat(content.split("Test message 1", -1)).hasSize(3); // 2 occurrences = 3 parts
+        assertThat(content.split("Test message 2", -1)).hasSize(3); // 2 occurrences = 3 parts
     }
 
     @AfterEach

powertools-logging/powertools-logging-logback/src/test/java/software/amazon/lambda/powertools/logging/LogbackLoggingManagerTest.java

@@ -28,7 +28,7 @@
 import java.nio.file.StandardOpenOption;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,8 +44,18 @@ class LogbackLoggingManagerTest {
     private static final Logger LOG = LoggerFactory.getLogger(LogbackLoggingManagerTest.class);
     private static final Logger ROOT = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
+    @BeforeEach
+    void setUp() throws JoranException, IOException {
+        resetLogbackConfig("/logback-test.xml");
+        
+        try {
+            FileChannel.open(Paths.get("target/logfile.json"), StandardOpenOption.WRITE).truncate(0).close();
+        } catch (NoSuchFileException e) {
+            // may not be there in the first run
+        }
+    }
+
     @Test
-    @Order(1)
     void getLogLevel_shouldReturnConfiguredLogLevel() {
         LogbackLoggingManager manager = new LogbackLoggingManager();
         Level logLevel = manager.getLogLevel(LOG);
@@ -56,7 +66,6 @@ void getLogLevel_shouldReturnConfiguredLogLevel() {
     }
 
     @Test
-    @Order(2)
     void resetLogLevel() {
         LogbackLoggingManager manager = new LogbackLoggingManager();
         manager.setLogLevel(ERROR);
@@ -68,18 +77,7 @@ void resetLogLevel() {
     @Test
     void shouldDetectMultipleBufferingAppendersRegardlessOfName() throws IOException, JoranException {
         // Given - configuration with multiple BufferingAppenders with different names
-        try {
-            FileChannel.open(Paths.get("target/logfile.json"), StandardOpenOption.WRITE).truncate(0).close();
-        } catch (NoSuchFileException e) {
-            // may not be there in the first run
-        }
-
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        context.reset();
-
-        JoranConfigurator configurator = new JoranConfigurator();
-        configurator.setContext(context);
-        configurator.doConfigure(getClass().getResourceAsStream("/logback-multiple-buffering.xml"));
+        resetLogbackConfig("/logback-multiple-buffering.xml");
 
         Logger logger = LoggerFactory.getLogger("test.multiple.appenders");
 
@@ -100,11 +98,15 @@ void shouldDetectMultipleBufferingAppendersRegardlessOfName() throws IOException
     }
 
     @AfterEach
-    void cleanUp() throws IOException {
-        try {
-            FileChannel.open(Paths.get("target/logfile.json"), StandardOpenOption.WRITE).truncate(0).close();
-        } catch (NoSuchFileException e) {
-            // may not be there
-        }
+    void cleanUp() throws JoranException {
+        resetLogbackConfig("/logback-test.xml");
+    }
+
+    private void resetLogbackConfig(String configFileName) throws JoranException {
+        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+        context.reset();
+        JoranConfigurator configurator = new JoranConfigurator();
+        configurator.setContext(context);
+        configurator.doConfigure(getClass().getResourceAsStream(configFileName));
     }
 }