You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/11/20 13:54:11 UTC
cvs commit: logging-log4j/tests/src/java/org/apache/log4j HierarchyThresholdTestCase.java
ceki 2004/11/20 04:54:11
Modified: tests/input/hierarchy hierarchyThreshold6.properties
hierarchyThreshold1.properties
hierarchyThreshold8.properties
hierarchyThreshold7.properties
tests/src/java/org/apache/log4j
HierarchyThresholdTestCase.java
Removed: tests/input hierarchyThreshold4.properties
hierarchyThreshold6.properties
hierarchyThreshold2.properties
hierarchyThreshold7.properties
hierarchyThreshold8.properties
hierarchyThreshold1.properties
hierarchyThreshold5.properties
hierarchyThreshold3.properties
Log:
Fixed HierarchyThresholdTestCase
Revision Changes Path
1.2 +6 -1 logging-log4j/tests/input/hierarchy/hierarchyThreshold6.properties
Index: hierarchyThreshold6.properties
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/hierarchy/hierarchyThreshold6.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hierarchyThreshold6.properties 20 Nov 2004 12:50:13 -0000 1.1
+++ hierarchyThreshold6.properties 20 Nov 2004 12:54:11 -0000 1.2
@@ -4,4 +4,9 @@
log4j.appender.A.File=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
\ No newline at end of file
+log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
+
+# Prevent internal log4j DEBUG messages from polluting the output.
+log4j.logger.org.apache.log4j.PropertyConfigurator=INFO
+log4j.logger.org.apache.log4j.config.PropertySetter=INFO
+log4j.logger.org.apache.log4j.FileAppender=INFO
1.2 +6 -1 logging-log4j/tests/input/hierarchy/hierarchyThreshold1.properties
Index: hierarchyThreshold1.properties
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/hierarchy/hierarchyThreshold1.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hierarchyThreshold1.properties 20 Nov 2004 12:50:13 -0000 1.1
+++ hierarchyThreshold1.properties 20 Nov 2004 12:54:11 -0000 1.2
@@ -4,4 +4,9 @@
log4j.appender.A.File=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
\ No newline at end of file
+log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
+
+# Prevent internal log4j DEBUG messages from polluting the output.
+log4j.logger.org.apache.log4j.PropertyConfigurator=INFO
+log4j.logger.org.apache.log4j.config.PropertySetter=INFO
+log4j.logger.org.apache.log4j.FileAppender=INFO
1.2 +6 -1 logging-log4j/tests/input/hierarchy/hierarchyThreshold8.properties
Index: hierarchyThreshold8.properties
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/hierarchy/hierarchyThreshold8.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hierarchyThreshold8.properties 20 Nov 2004 12:50:13 -0000 1.1
+++ hierarchyThreshold8.properties 20 Nov 2004 12:54:11 -0000 1.2
@@ -4,4 +4,9 @@
log4j.appender.A.File=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
\ No newline at end of file
+log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
+
+# Prevent internal log4j DEBUG messages from polluting the output.
+log4j.logger.org.apache.log4j.PropertyConfigurator=INFO
+log4j.logger.org.apache.log4j.config.PropertySetter=INFO
+log4j.logger.org.apache.log4j.FileAppender=INFO
1.2 +5 -0 logging-log4j/tests/input/hierarchy/hierarchyThreshold7.properties
Index: hierarchyThreshold7.properties
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/hierarchy/hierarchyThreshold7.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hierarchyThreshold7.properties 20 Nov 2004 12:50:13 -0000 1.1
+++ hierarchyThreshold7.properties 20 Nov 2004 12:54:11 -0000 1.2
@@ -5,3 +5,8 @@
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%p [%t] %c{2} = %m%n
+
+# Prevent internal log4j DEBUG messages from polluting the output.
+log4j.logger.org.apache.log4j.PropertyConfigurator=INFO
+log4j.logger.org.apache.log4j.config.PropertySetter=INFO
+log4j.logger.org.apache.log4j.FileAppender=INFO
1.4 +9 -9 logging-log4j/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java
Index: HierarchyThresholdTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HierarchyThresholdTestCase.java 27 Feb 2004 16:47:36 -0000 1.3
+++ HierarchyThresholdTestCase.java 20 Nov 2004 12:54:11 -0000 1.4
@@ -52,49 +52,49 @@
}
public void test1() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold1.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold1.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.1"));
}
public void test2() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold2.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold2.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.2"));
}
public void test3() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold3.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold3.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.3"));
}
public void test4() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold4.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold4.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.4"));
}
public void test5() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold5.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold5.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.5"));
}
public void test6() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold6.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold6.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.6"));
}
public void test7() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold7.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold7.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.7"));
}
public void test8() throws Exception {
- PropertyConfigurator.configure("input/hierarchyThreshold8.properties");
+ PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold8.properties");
common();
assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.8"));
}
@@ -108,7 +108,7 @@
logger.fatal("m5");
}
- public static Test suite() {
+ public static Test XXXsuite() {
TestSuite suite = new TestSuite();
suite.addTest(new HierarchyThresholdTestCase("test1"));
suite.addTest(new HierarchyThresholdTestCase("test2"));
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org