CAMEL-22635: Fix LogCaptureTest in camel-netty and camel-netty-http

components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/LogCaptureTest.java

@@ -18,20 +18,42 @@
 
 import io.netty.util.ResourceLeakDetector;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.junit.jupiter.api.Disabled;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Logger;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
- * This test ensures LogCaptureAppender is configured properly
+ * This test ensures LogCaptureAppender can capture log events programmatically.
  */
-@Disabled
+@Isolated
 public class LogCaptureTest {
+
+    private LogCaptureAppender appender;
+
+    @BeforeEach
+    void setUp() {
+        appender = new LogCaptureAppender("capture", null, null);
+        appender.start();
+        Logger logger = (Logger) LogManager.getLogger(ResourceLeakDetector.class);
+        logger.addAppender(appender);
+    }
+
+    @AfterEach
+    void tearDown() {
+        Logger logger = (Logger) LogManager.getLogger(ResourceLeakDetector.class);
+        logger.removeAppender(appender);
+        appender.stop();
+        LogCaptureAppender.reset();
+    }
+
     @Test
     public void testCapture() {
         InternalLoggerFactory.getInstance(ResourceLeakDetector.class).error("testError");
         assertFalse(LogCaptureAppender.getEvents().isEmpty());
-        LogCaptureAppender.reset();
     }
 }

components/camel-netty-http/src/test/resources/log4j2.properties

@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-#configuration.packages=org.apache.camel.component.netty.http
 appender.file.type = File
 appender.file.name = file
 appender.file.fileName = target/camel-netty-http-test.log
@@ -25,11 +24,6 @@ appender.out.type = Console
 appender.out.name = out
 appender.out.layout.type = PatternLayout
 appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-#appender.capture.type=LogCaptureAppender
-#appender.capture.name=capture
-
-#logger.leak.name = io.netty.util.ResourceLeakDetector
-#logger.leak.appenderRef.capture.ref = capture
 
 rootLogger.level = INFO
 rootLogger.appenderRef.file.ref = file

components/camel-netty/src/test/java/org/apache/camel/component/netty/LogCaptureTest.java

@@ -19,25 +19,45 @@
 import io.netty.util.ResourceLeakDetector;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 import org.apache.camel.processor.errorhandler.DefaultErrorHandler;
-import org.junit.jupiter.api.Disabled;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Logger;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Isolated;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
- * This test ensures LogCaptureAppender is configured properly
+ * This test ensures LogCaptureAppender can capture log events programmatically.
  */
 @Isolated
-@Disabled
 public class LogCaptureTest {
+
+    private LogCaptureAppender appender;
+
+    @BeforeEach
+    void setUp() {
+        appender = new LogCaptureAppender("capture", null, null);
+        appender.start();
+        Logger logger = (Logger) LogManager.getLogger(ResourceLeakDetector.class);
+        logger.addAppender(appender);
+    }
+
+    @AfterEach
+    void tearDown() {
+        Logger logger = (Logger) LogManager.getLogger(ResourceLeakDetector.class);
+        logger.removeAppender(appender);
+        appender.stop();
+        LogCaptureAppender.reset();
+    }
+
     @Test
     public void testCapture() {
         InternalLoggerFactory.getInstance(ResourceLeakDetector.class).error("testError");
         assertFalse(LogCaptureAppender.getEvents(ResourceLeakDetector.class).isEmpty());
         assertTrue(LogCaptureAppender.hasEventsFor(ResourceLeakDetector.class));
         assertTrue(LogCaptureAppender.getEvents(DefaultErrorHandler.class).isEmpty());
-        LogCaptureAppender.reset();
     }
 }

components/camel-netty/src/test/resources/log4j2.properties

@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-#configuration.packages=org.apache.camel.component.netty
 appender.file.type = File
 appender.file.name = file
 appender.file.fileName = target/camel-netty-test.log
@@ -25,12 +24,5 @@ appender.out.type = Console
 appender.out.name = out
 appender.out.layout.type = PatternLayout
 appender.out.layout.pattern = %d [%-35.35t] %-5p %-30.30c{1} - %m%n
-#appender.capture.type=LogCaptureAppender
-#appender.capture.name=capture
-
-logger.leak.name = io.netty.util.ResourceLeakDetector
-logger.leak.appenderRef.capture.ref = capture
-#logger.errorHandler.name = org.apache.camel.processor.errorhandler.DefaultErrorHandler
-#logger.errorHandler.appenderRef.capture.ref = capture
 rootLogger.level = INFO
 rootLogger.appenderRef.file.ref = file