minor adjustements related to NewAsyncAppender

Signed-off-by: Ceki Gulcu <[email protected]>
qos-ch · Dec 10, 2024 · 63576af · 63576af
1 parent 70dba2d
commit 63576af
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/src/test/input/xml/newAsyncAppender0.xml b/src/test/input/xml/newAsyncAppender0.xml
@@ -20,16 +20,18 @@
                      xmlns:log4j='http://jakarta.apache.org/log4j/'>
 
 
-    <appender name="V1" class="org.apache.log4j.VectorAppender"/>
+    <appender name="V1" class="org.apache.log4j.VectorAppender">
+        <param name="delay" value="0"/>
+    </appender>
 
     <appender name="ASYNC" class="org.apache.log4j.NewAsyncAppender">
         <param name="QueueSize" value="500"/> <!-- Buffer size for events -->
         <appender-ref ref="V1"/>
     </appender>
 
     <root>
-        <level value="trace" />
-        <appender-ref ref="ASYNC" />
+        <level value="trace"/>
+        <appender-ref ref="ASYNC"/>
     </root>
 
 </log4j:configuration>
diff --git a/src/test/java/org/apache/log4j/AsyncAppenderTestCase.java b/src/test/java/org/apache/log4j/AsyncAppenderTestCase.java
@@ -150,8 +150,8 @@ public void testLocationInfoTrue() {
         layout.setConversionPattern("%C:%L %m%n");
         layout.activateOptions();
         String initialStr = layout.format(initialEvent);
-        assertEquals(AsyncAppenderTestCase.class.getName(),
-                initialStr.substring(0, AsyncAppenderTestCase.class.getName().length()));
+        assertEquals(Greeter.class.getName(),
+                initialStr.substring(0, Greeter.class.getName().length()));
         String discardStr = layout.format(discardEvent);
         assertEquals("?:? ", discardStr.substring(0, 4));
     }

diff --git a/src/test/java/org/apache/log4j/VectorAppender.java b/src/test/java/org/apache/log4j/VectorAppender.java
@@ -28,10 +28,9 @@
  */
 public class VectorAppender extends AppenderSkeleton {
 
-    public Vector vector;
+    public Vector<LoggingEvent> vector = new Vector<LoggingEvent>();
     long delay = 100;
     public VectorAppender() {
-        vector = new Vector();
     }
 
     public long getDelay() {
@@ -46,25 +45,25 @@ public void setDelay(long delay) {
      * Does nothing.
      */
     public void activateOptions() {
+        //System.out.println("activateOptions called");
     }
 
     /**
      * This method is called by the {@link AppenderSkeleton#doAppend} method.
      */
     public void append(LoggingEvent event) {
-        // System.out.println("---Vector appender called with message
-        // ["+event.getRenderedMessage()+"].");
+        //System.out.println("---Vector appender called with message ["+event.getRenderedMessage()+"].");
         // System.out.flush();
         try {
             if(delay > 0) {
                 Thread.sleep(delay);
             }
         } catch (Exception e) {
         }
-        vector.addElement(event);
+        vector.add(event);
     }
 
-    public Vector getVector() {
+    public Vector<LoggingEvent> getVector() {
         return vector;
     }
 

diff --git a/src/test/java/org/apache/log4j/xml/DOM_NewAsyncAppenderTestCase.java b/src/test/java/org/apache/log4j/xml/DOM_NewAsyncAppenderTestCase.java
@@ -1,15 +1,15 @@
 package org.apache.log4j.xml;
 
 import org.apache.log4j.*;
+import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.util.Compare;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.apache.log4j.TestConstants.TEST_INPUT_PREFIX;
 import static org.apache.log4j.TestConstants.TEST_WITNESS_PREFIX;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class DOM_NewAsyncAppenderTestCase {
     Logger root;
@@ -21,21 +21,34 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        System.out.println("----tearing down ");
         root.getLoggerRepository().resetConfiguration();
     }
 
 
     @Test
-    public void test1() throws Exception {
+    public void smoke() throws Exception {
+        String msg = "hello";
         DOMConfigurator.configure(TEST_INPUT_PREFIX + "xml/newAsyncAppender0.xml");
+        root.info(msg);
+
         Appender appender = root.getAppender("ASYNC");
         assertTrue(appender instanceof NewAsyncAppender);
 
         NewAsyncAppender newAsyncAppender = (NewAsyncAppender) appender;
 
         VectorAppender vectorAppender = (VectorAppender) newAsyncAppender.getAppender("V1");
         assertNotNull(vectorAppender);
-
+
+
+        Thread.currentThread().sleep(100);
+
+        assertEquals(1, vectorAppender.getVector().size());
+
+        LoggingEvent event = (LoggingEvent) vectorAppender.vector.elementAt(0);
+
+        assertEquals(msg, event.getMessage());
+
 
     }
 }