Add a test of the effect of a static NDC variable

apache · Nov 6, 2024 · 47f1321 · 47f1321
1 parent 4642a50
commit 47f1321
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/src/test/cpp/ndctestcase.cpp b/src/test/cpp/ndctestcase.cpp
@@ -24,10 +24,9 @@
 #include "logunit.h"
 #include "util/compare.h"
 
-
+static log4cxx::NDC ndc("ndctest");
 
 using namespace log4cxx;
-
 LOGUNIT_CLASS(NDCTestCase)
 {
 	static File TEMP;

diff --git a/src/test/resources/witness/ndc/NDC.1 b/src/test/resources/witness/ndc/NDC.1
@@ -1,23 +1,23 @@
-DEBUG null - m1
-INFO  null - m2
-WARN  null - m3
-ERROR null - m4
-FATAL null - m5
-DEBUG n1 - m1
-INFO  n1 - m2
-WARN  n1 - m3
-ERROR n1 - m4
-FATAL n1 - m5
-DEBUG n1 n2 n3 - m1
-INFO  n1 n2 n3 - m2
-WARN  n1 n2 n3 - m3
-ERROR n1 n2 n3 - m4
-FATAL n1 n2 n3 - m5
-DEBUG n1 n2 - m1
-INFO  n1 n2 - m2
-WARN  n1 n2 - m3
-ERROR n1 n2 - m4
-FATAL n1 n2 - m5
+DEBUG ndctest - m1
+INFO  ndctest - m2
+WARN  ndctest - m3
+ERROR ndctest - m4
+FATAL ndctest - m5
+DEBUG ndctest n1 - m1
+INFO  ndctest n1 - m2
+WARN  ndctest n1 - m3
+ERROR ndctest n1 - m4
+FATAL ndctest n1 - m5
+DEBUG ndctest n1 n2 n3 - m1
+INFO  ndctest n1 n2 n3 - m2
+WARN  ndctest n1 n2 n3 - m3
+ERROR ndctest n1 n2 n3 - m4
+FATAL ndctest n1 n2 n3 - m5
+DEBUG ndctest n1 n2 - m1
+INFO  ndctest n1 n2 - m2
+WARN  ndctest n1 n2 - m3
+ERROR ndctest n1 n2 - m4
+FATAL ndctest n1 n2 - m5
 DEBUG null - m1
 INFO  null - m2
 WARN  null - m3