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 ca...@apache.org on 2005/07/22 21:03:23 UTC
cvs commit: logging-log4j/tests/src/java/org/apache/log4j LevelTest.java LoggerTest.java
carnold 2005/07/22 12:03:23
Modified: tests/src/java/org/apache/log4j LevelTest.java
LoggerTest.java
Log:
Bug 35711: Add TRACE level to 1.2 api
Revision Changes Path
1.2 +23 -1 logging-log4j/tests/src/java/org/apache/log4j/LevelTest.java
Index: LevelTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/LevelTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LevelTest.java 18 Jul 2005 16:17:45 -0000 1.1
+++ LevelTest.java 22 Jul 2005 19:03:23 -0000 1.2
@@ -25,7 +25,7 @@
* Tests of Level.
*
* @author Curt Arnold
- * @since 1.3
+ * @since 1.2.12
*/
public class LevelTest extends TestCase {
/**
@@ -89,4 +89,26 @@
Level.INFO.level, Level.INFO.levelStr, Level.INFO.syslogEquivalent);
}
}
+
+ public void testTraceInt() {
+ assertEquals(5000, Level.TRACE_INT);
+ }
+
+ public void testTrace() {
+ assertEquals("TRACE", Level.TRACE.toString());
+ assertEquals(5000, Level.TRACE.toInt());
+ assertEquals(7, Level.TRACE.getSyslogEquivalent());
+ }
+
+ public void testIntToTrace() {
+ Level trace = Level.toLevel(5000);
+ assertEquals("TRACE", trace.toString());
+ }
+
+ public void testStringToTrace() {
+ Level trace = Level.toLevel("TRACE");
+ assertEquals("TRACE", trace.toString());
+ }
+
+
}
1.3 +72 -19 logging-log4j/tests/src/java/org/apache/log4j/LoggerTest.java
Index: LoggerTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/LoggerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggerTest.java 8 Mar 2005 22:32:57 -0000 1.2
+++ LoggerTest.java 22 Jul 2005 19:03:23 -0000 1.3
@@ -16,15 +16,15 @@
package org.apache.log4j;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.log4j.spi.*;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.spi.RootLogger;
import java.util.Enumeration;
import java.util.Locale;
import java.util.ResourceBundle;
+import java.util.Vector;
/**
@@ -350,22 +350,75 @@
assertSame(a0, a1);
}
- public static Test DISABLEDsuite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new LoggerTest("testAppender1"));
- suite.addTest(new LoggerTest("testAppender2"));
- suite.addTest(new LoggerTest("testAdditivity1"));
- suite.addTest(new LoggerTest("testAdditivity2"));
- suite.addTest(new LoggerTest("testAdditivity3"));
- suite.addTest(new LoggerTest("testDisable1"));
- suite.addTest(new LoggerTest("testRB1"));
- suite.addTest(new LoggerTest("testRB2"));
- suite.addTest(new LoggerTest("testRB3"));
- suite.addTest(new LoggerTest("testExists"));
- suite.addTest(new LoggerTest("testHierarchy1"));
- return suite;
- }
+ /**
+ * Tests logger.trace(Object).
+ * @since 1.2.12
+ */
+ public void testTrace() {
+ VectorAppender appender = new VectorAppender();
+ appender.activateOptions();
+ Logger root = Logger.getRootLogger();
+ root.addAppender(appender);
+ root.setLevel(Level.INFO);
+
+ Logger tracer = Logger.getLogger("com.example.Tracer");
+ tracer.setLevel(Level.TRACE);
+
+ tracer.trace("Message 1");
+ root.trace("Discarded Message");
+ root.trace("Discarded Message");
+
+ Vector msgs = appender.getVector();
+ assertEquals(1, msgs.size());
+ LoggingEvent event = (LoggingEvent) msgs.get(0);
+ assertEquals(Level.TRACE, event.getLevel());
+ assertEquals("Message 1", event.getMessage());
+ }
+
+ /**
+ * Tests logger.trace(Object, Exception).
+ * @since 1.2.12
+ */
+ public void testTraceWithException() {
+ VectorAppender appender = new VectorAppender();
+ appender.activateOptions();
+ Logger root = Logger.getRootLogger();
+ root.addAppender(appender);
+ root.setLevel(Level.INFO);
+
+ Logger tracer = Logger.getLogger("com.example.Tracer");
+ tracer.setLevel(Level.TRACE);
+ NullPointerException ex = new NullPointerException();
+
+ tracer.trace("Message 1", ex);
+ root.trace("Discarded Message", ex);
+ root.trace("Discarded Message", ex);
+
+ Vector msgs = appender.getVector();
+ assertEquals(1, msgs.size());
+ LoggingEvent event = (LoggingEvent) msgs.get(0);
+ assertEquals(Level.TRACE, event.getLevel());
+ assertEquals("Message 1", event.getMessage());
+ }
+
+ /**
+ * Tests isTraceEnabled.
+ * @since 1.2.12
+ */
+ public void testIsTraceEnabled() {
+ VectorAppender appender = new VectorAppender();
+ appender.activateOptions();
+ Logger root = Logger.getRootLogger();
+ root.addAppender(appender);
+ root.setLevel(Level.INFO);
+
+ Logger tracer = Logger.getLogger("com.example.Tracer");
+ tracer.setLevel(Level.TRACE);
+
+ assertTrue(tracer.isTraceEnabled());
+ assertFalse(root.isTraceEnabled());
+ }
private static class CountingAppender extends AppenderSkeleton {
int counter;
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org