These two test cases failed before, but things look to me like their …

…log config and witness was simply wrong: The other tests use `%c` instead of `%C` and `root` as the keyword as well and looking at the docs for `%C` using that might make no sense at all. The log message is transferred using network communication and there most likely is no issuing class to generate by log4j unless that is communicated over the wire as well. I guess that's simply not the case. Because the test have been disabled for so long, nobody recognized. https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
apache · Feb 10, 2020 · 0baf607 · 0baf607
1 parent af0134a
commit 0baf607
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/src/test/cpp/net/socketservertestcase.cpp b/src/test/cpp/net/socketservertestcase.cpp
@@ -93,7 +93,7 @@ using namespace log4cxx::net;
 /**
  *  This test checks receipt of SocketAppender messages by the ShortSocketServer
  *  class from log4j.  That class must be started externally to this class
- *  for this test to succeed. 
+ *  for this test to succeed.
  */
 LOGUNIT_CLASS(SocketServerTestCase)
 {
@@ -135,8 +135,6 @@ LOGUNIT_CLASS(SocketServerTestCase)
         }
 
         /**
-        The pattern on the server side: %5p %x [%t] %c %m%n.
-
         We are testing NDC functionality across the wire.
         */
         void test1()
@@ -422,7 +420,7 @@ LOGUNIT_CLASS(SocketServerTestCase)
                 int i = -1;
                 NDC::push(dc);
                 MDC::put(key, val);
-                
+
                 logger->setLevel(Level::getDebug());
                 root->setLevel(Level::getDebug());
 
@@ -431,17 +429,17 @@ LOGUNIT_CLASS(SocketServerTestCase)
 
                 logger->setLevel(Level::getTrace());
                 root->setLevel(Level::getTrace());
-                
+
                 LOG4CXX_TRACE(logger, "Message " << ++i);
                 LOG4CXX_TRACE(root, "Message " << ++i);
 
                 LOG4CXX_DEBUG(logger, "Message " << ++i);
                 LOG4CXX_DEBUG(root, "Message " << ++i);
-                
+
                 LOG4CXX_INFO(logger, "Message "  << ++i);
                 LOG4CXX_WARN(logger, "Message " << ++i);
                 LOG4CXX_FATAL(logger, "Message " << ++i); //5
-                
+
                 std::string exceptionMsg("\njava.lang.Exception: Just testing\n"
                     "\tat org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)\n"
                     "\tat org.apache.log4j.net.SocketServerTestCase.");
@@ -456,7 +454,7 @@ LOGUNIT_CLASS(SocketServerTestCase)
                     "\tat junit.framework.TestSuite.runTest(TestSuite.java:XXX)\n"
                     "\tat junit.framework.TestSuite.run(TestSuite.java:XXX)");
 
-                
+
                 LOG4CXX_DEBUG(logger, "Message " << ++i << exceptionMsg);
                 LOG4CXX_ERROR(root, "Message " << ++i << exceptionMsg);
 

diff --git a/src/test/resources/input/socketServer2.properties b/src/test/resources/input/socketServer2.properties
@@ -19,5 +19,5 @@ log4j.appender.A=org.apache.log4j.FileAppender
 log4j.appender.A.file=output/temp
 log4j.appender.A.Append=false
 log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %C (%F:%L) %m%n
+log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %c{1} (%F:%L) %m%n
 
diff --git a/src/test/resources/input/socketServer3.properties b/src/test/resources/input/socketServer3.properties
@@ -19,4 +19,4 @@ log4j.appender.A=org.apache.log4j.FileAppender
 log4j.appender.A.file=output/temp
 log4j.appender.A.Append=false
 log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %C (%F:%L) %m%n
+log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %c{1} (%F:%L) %m%n
diff --git a/src/test/resources/witness/socketServer.2 b/src/test/resources/witness/socketServer.2
@@ -1,7 +1,7 @@
 TRACE T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 1
-TRACE T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 2
+TRACE T2 [main] root (socketservertestcase.cpp:XXX) Message 2
 DEBUG T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 3
-DEBUG T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 4
+DEBUG T2 [main] root (socketservertestcase.cpp:XXX) Message 4
  INFO T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 5
  WARN T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 6
 FATAL T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 7
@@ -17,7 +17,7 @@ java.lang.Exception: Just testing
 	at junit.framework.TestCase.run(TestCase.java:XXX)
 	at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
 	at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 9
+ERROR T2 [main] root (socketservertestcase.cpp:XXX) Message 9
 java.lang.Exception: Just testing
 	at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
 	at org.apache.log4j.net.SocketServerTestCase.test2(SocketServerTestCase.java:XXX)

diff --git a/src/test/resources/witness/socketServer.3 b/src/test/resources/witness/socketServer.3
@@ -1,7 +1,7 @@
 TRACE T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 1
-TRACE T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 2
+TRACE T3 [main] root (socketservertestcase.cpp:XXX) Message 2
 DEBUG T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 3
-DEBUG T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 4
+DEBUG T3 [main] root (socketservertestcase.cpp:XXX) Message 4
  INFO T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 5
  WARN T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 6
 FATAL T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 7
@@ -17,7 +17,7 @@ java.lang.Exception: Just testing
 	at junit.framework.TestCase.run(TestCase.java:XXX)
 	at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
 	at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 9
+ERROR T3 [main] root (socketservertestcase.cpp:XXX) Message 9
 java.lang.Exception: Just testing
 	at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
 	at org.apache.log4j.net.SocketServerTestCase.test3(SocketServerTestCase.java:XXX)