October 2007 - logback-dev - mailman3.qos.ch

svn commit: r1597 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event
by noreply.ceki＠qos.ch 04 Oct '07

04 Oct '07

Author: ceki Date: Thu Oct 4 14:38:26 2007 New Revision: 1597 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java Log: corrected bug caught by FindBugz Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java Thu Oct 4 14:38:26 2007 @@ -187,7 +187,7 @@ } public void addWarn(String msg, Throwable ex) { - addWarn(msg, ex); + cai.addWarn(msg, ex); } public Context getContext() {

1 0

[continuum] BUILD SUCCESSFUL: Logback Core Module
by John Noreplai 04 Oct '07

04 Oct '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Thu, 4 Oct 2007 13:20:13 +0200 Finished at: Thu, 4 Oct 2007 13:20:27 +0200 Total time: 13s Build Trigger: Schedule Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki test fix /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Core Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 146 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 85 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.core.StopWatchTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 sec Running ch.qos.logback.core.rolling.TimeBasedRollingTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.101 sec Running ch.qos.logback.core.joran.TrivialcConfiguratorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.162 sec Running ch.qos.logback.core.appender.ConsoleAppenderTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.core.rolling.SizeBasedTriggeringPolicyTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Running ch.qos.logback.core.util.FileSizeTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.core.pattern.parser.TokenStreamTest Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.088 sec Running ch.qos.logback.core.pattern.parser.CompilerTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec Running ch.qos.logback.core.util.PropertySetterTest LOGBACK: No context given for ch.qos.logback.core.util.PropertySetter@3cccc588 Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.054 sec Running ch.qos.logback.core.joran.SkippingInInterpreterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec Running ch.qos.logback.core.joran.spi.PatternTest Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.core.pattern.parser.ParserTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec Running ch.qos.logback.core.util.StatusPrinterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.core.util.TimeUtilTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec Running ch.qos.logback.core.joran.event.InPlayFireTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 sec Running ch.qos.logback.core.pattern.parser.FormatInfoTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.125 sec Running ch.qos.logback.core.util.DurationTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.core.joran.action.IncludeActionTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.081 sec Running ch.qos.logback.core.rolling.helper.CompressTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 sec Running ch.qos.logback.core.joran.event.EventRecorderTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec Running ch.qos.logback.core.boolex.MatcherTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.core.joran.action.PropertyActionTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.core.pattern.parser.SamplePatternLayoutTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.073 sec Running ch.qos.logback.core.rolling.RenamingTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.4 sec Running ch.qos.logback.core.util.OptionHelperTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.status.StatusBaseTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.core.joran.spi.SimpleStoreTest Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec Running ch.qos.logback.core.joran.replay.FruitConfigurationTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.026 sec Running ch.qos.logback.core.pattern.parser.OptionTokenizerTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec Running ch.qos.logback.core.rolling.helper.RollingCalendarTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.core.appender.DummyAppenderTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.core.appender.FileAppenderTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.core.rolling.helper.FileNamePatternTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.joran.ia.SimplePropertyIATest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec Results : Tests run: 156, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT.jar [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: default}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT-sources.jar [INFO] [jar:jar {execution: bundle-test-jar}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT.jar [INFO] [jar:test-jar {execution: bundle-test-jar}] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT-tests.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-core/0.9.9-SNAPSHOT/logback-core-0.9.9-SNAPSHOT.jar [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT-sources.jar to /root/.m2/repository/ch/qos/logback/logback-core/0.9.9-SNAPSHOT/logback-core-0.9.9-SNAPSHOT-sources.jar [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/logback-core-0.9.9-SNAPSHOT-tests.jar to /root/.m2/repository/ch/qos/logback/logback-core/0.9.9-SNAPSHOT/logback-core-0.9.9-SNAPSHOT-tests.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 12 seconds [INFO] Finished at: Thu Oct 04 13:20:26 CEST 2007 [INFO] Final Memory: 17M/201M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r1596 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 04 Oct '07

04 Oct '07

Author: ceki Date: Thu Oct 4 13:09:40 2007 New Revision: 1596 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Log: test fix Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Thu Oct 4 13:09:40 2007 @@ -49,7 +49,7 @@ { long d = sw.startTime+6*StopWatch.NANOS_IN_ONE_SECOND; String s = sw.stop(d).toString(); - assertTrue(s.endsWith("6.000 milliseconds.")); + assertTrue(s.endsWith("6.000 seconds.")); } }

1 0

svn commit: r1595 - in logback/trunk/logback-classic/src/test: input/joran java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 04 Oct '07

04 Oct '07

Author: ceki Date: Thu Oct 4 13:09:21 2007 New Revision: 1595 Modified: logback/trunk/logback-classic/src/test/input/joran/simpleLevel.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java Log: cleaning up noise ouput during testing Modified: logback/trunk/logback-classic/src/test/input/joran/simpleLevel.xml ============================================================================== --- logback/trunk/logback-classic/src/test/input/joran/simpleLevel.xml (original) +++ logback/trunk/logback-classic/src/test/input/joran/simpleLevel.xml Thu Oct 4 13:09:21 2007 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE configuration> -<configuration debug="true"> +<configuration debug="false"> <appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java Thu Oct 4 13:09:21 2007 @@ -22,7 +22,6 @@ import ch.qos.logback.classic.util.TestConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; -import ch.qos.logback.core.util.StatusPrinter; public class BasicJoranTest extends TestCase { @@ -55,8 +54,6 @@ jc.setContext(loggerContext); jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); - //StatusPrinter.print(loggerContext.getStatusManager()); - Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(LoggerContext.ROOT_NAME); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); @@ -64,8 +61,6 @@ String msg = "hello world"; logger.debug(msg); assertEquals(0, listAppender.list.size()); - //LoggingEvent le = (LoggingEvent) listAppender.list.get(0); - //assertEquals(msg, le.getMessage()); } public void testEval() throws JoranException { @@ -74,7 +69,7 @@ jc.setContext(loggerContext); jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); - StatusPrinter.print(loggerContext); + //StatusPrinter.print(loggerContext); Logger logger = loggerContext.getLogger(this.getClass().getName()); String msg = "hello world"; @@ -124,10 +119,14 @@ assertEquals(2, dutf.getUsers().size()); } - + public void test() { + + } // COMMENTED_OUT_ - public static Test COMMENTED_OUT_suite() { + public static Test suite() { TestSuite suite = new TestSuite(); + //suite.addTestSuite(BasicJoranTest.class); + suite.addTest(new BasicJoranTest("testLevel")); //suite.addTest(new BasicJoranTest("testSimpleList"));

1 0

[continuum] BUILD FAILURE: Logback Core Module
by John Noreplai 04 Oct '07

04 Oct '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Thu, 4 Oct 2007 12:00:17 +0200 Finished at: Thu, 4 Oct 2007 12:00:31 +0200 Total time: 14s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki minor refactoring of the StopWatch class /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Core Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 146 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 85 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/45/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.core.StopWatchTest Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE! Running ch.qos.logback.core.rolling.TimeBasedRollingTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.132 sec Running ch.qos.logback.core.joran.TrivialcConfiguratorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.052 sec Running ch.qos.logback.core.appender.ConsoleAppenderTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec Running ch.qos.logback.core.rolling.SizeBasedTriggeringPolicyTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec Running ch.qos.logback.core.util.FileSizeTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.core.pattern.parser.TokenStreamTest Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec Running ch.qos.logback.core.pattern.parser.CompilerTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.core.util.PropertySetterTest LOGBACK: No context given for ch.qos.logback.core.util.PropertySetter@73a34b Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 sec Running ch.qos.logback.core.joran.SkippingInInterpreterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec Running ch.qos.logback.core.joran.spi.PatternTest Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.core.pattern.parser.ParserTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.core.util.StatusPrinterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.core.util.TimeUtilTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec Running ch.qos.logback.core.joran.event.InPlayFireTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec Running ch.qos.logback.core.pattern.parser.FormatInfoTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec Running ch.qos.logback.core.util.DurationTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running ch.qos.logback.core.joran.action.IncludeActionTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.114 sec Running ch.qos.logback.core.rolling.helper.CompressTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.035 sec Running ch.qos.logback.core.joran.event.EventRecorderTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec Running ch.qos.logback.core.boolex.MatcherTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.core.joran.action.PropertyActionTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Running ch.qos.logback.core.pattern.parser.SamplePatternLayoutTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.core.rolling.RenamingTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.292 sec Running ch.qos.logback.core.util.OptionHelperTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.status.StatusBaseTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec Running ch.qos.logback.core.joran.spi.SimpleStoreTest Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running ch.qos.logback.core.joran.replay.FruitConfigurationTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec Running ch.qos.logback.core.pattern.parser.OptionTokenizerTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.rolling.helper.RollingCalendarTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.core.appender.DummyAppenderTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.appender.FileAppenderTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.core.rolling.helper.FileNamePatternTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running ch.qos.logback.core.joran.ia.SimplePropertyIATest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Results : Tests run: 156, Failures: 1, Errors: 0, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 13 seconds [INFO] Finished at: Thu Oct 04 12:00:31 CEST 2007 [INFO] Final Memory: 14M/179M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r1594 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core test/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 04 Oct '07

04 Oct '07

Author: ceki Date: Thu Oct 4 11:44:09 2007 New Revision: 1594 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Log: minor refactoring of the StopWatch class Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java Thu Oct 4 11:44:09 2007 @@ -4,30 +4,41 @@ public class StopWatch { - private static final int STARTED = 1; - private static final int STOPPED = 2; - private static final int NANOS_IN_ONE_MICROSECOND = 1000; - private static final int NANOS_IN_ONE_MILLISECOND = 1000*1000; - private static final int NANOS_IN_ONE_SECOND = 1000*1000*1000; private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("0.000"); + static final long NANOS_IN_ONE_MICROSECOND = 1000; + static final long NANOS_IN_ONE_MILLISECOND = NANOS_IN_ONE_MICROSECOND * 1000; + static final long NANOS_IN_ONE_SECOND =NANOS_IN_ONE_MILLISECOND * 1000; + + enum Status { + STARTED, STOPPED; + } + + enum DurationUnit { + NANOSECOND, MICROSECOND, MILLISSECOND, SECOND; + } + final String name; final long startTime; long stopTime; - int status; + Status status; - StopWatch(String name) { + public StopWatch(String name) { this.name = name; this.startTime = System.nanoTime(); - this.status = STARTED; + this.status = Status.STARTED; } - StopWatch stop() { - this.status = STOPPED; - this.stopTime = System.nanoTime(); - return this; + public StopWatch stop() { + return stop(System.nanoTime()); } + public StopWatch stop(long stopTime) { + this.status = Status.STOPPED; + this.stopTime = stopTime; + return this; + } + @Override public String toString() { StringBuffer buf = new StringBuffer(); @@ -41,22 +52,24 @@ break; case STOPPED: buf.append("STOPPED at "); - if(getResultInNanos() < 10*NANOS_IN_ONE_MICROSECOND) { + switch (selectDurationUnitForDisplay(getResultInNanos())) { + case NANOSECOND: buf.append(getResultInNanos()); buf.append(" nanoseconds."); - } - else if (getResultInNanos() < 10*NANOS_IN_ONE_MILLISECOND) { + break; + case MICROSECOND: buf.append(getResultInMicros()); buf.append(" microseconds."); - } else if (getResultInNanos() < 5*NANOS_IN_ONE_SECOND) { - + break; + case MILLISSECOND: buf.append(getResultInMillis()); buf.append(" milliseconds."); - } else { + break; + case SECOND: double seconds = getResultInSeconds(); buf.append(DECIMAL_FORMAT.format(seconds)); buf.append(" seconds."); - + break; } break; default: @@ -65,8 +78,20 @@ return buf.toString(); } + DurationUnit selectDurationUnitForDisplay(long durationInNanos) { + if (durationInNanos < 10L * NANOS_IN_ONE_MICROSECOND) { + return DurationUnit.NANOSECOND; + } else if (durationInNanos < 10L * NANOS_IN_ONE_MILLISECOND) { + return DurationUnit.MICROSECOND; + } else if (durationInNanos < 5L * NANOS_IN_ONE_SECOND) { + return DurationUnit.MILLISSECOND; + } else { + return DurationUnit.SECOND; + } + } + public final long getResultInNanos() { - if (status == STARTED) { + if (status == Status.STARTED) { return 0; } else { return stopTime - startTime; @@ -80,7 +105,7 @@ public final long getResultInMillis() { return getResultInNanos() / NANOS_IN_ONE_MILLISECOND; } - + public final double getResultInSeconds() { return ((double) getResultInNanos() / NANOS_IN_ONE_SECOND); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Thu Oct 4 11:44:09 2007 @@ -18,11 +18,50 @@ public void testBasic() throws InterruptedException { StopWatch sw = new StopWatch("testBasic"); + + { + long d = sw.startTime+10; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("10 nanoseconds.")); + } - Thread.sleep(55100); - System.out.println(sw.stop().toString()); - - + { + long d = sw.startTime+9*StopWatch.NANOS_IN_ONE_MICROSECOND; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("9000 nanoseconds.")); + } + + { + long d = sw.startTime+11*StopWatch.NANOS_IN_ONE_MICROSECOND; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("11 microseconds.")); + } + { + long d = sw.startTime+9*StopWatch.NANOS_IN_ONE_MILLISECOND; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("9000 microseconds.")); + } + { + long d = sw.startTime+3*StopWatch.NANOS_IN_ONE_SECOND; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("3000 milliseconds.")); + } + { + long d = sw.startTime+6*StopWatch.NANOS_IN_ONE_SECOND; + String s = sw.stop(d).toString(); + assertTrue(s.endsWith("6.000 milliseconds.")); + } } + public void testSelectDurationUnitForDisplay() throws InterruptedException { + StopWatch sw = new StopWatch("testBasic"); + assertEquals(StopWatch.DurationUnit.NANOSECOND, sw.selectDurationUnitForDisplay(10)); + assertEquals(StopWatch.DurationUnit.NANOSECOND, sw.selectDurationUnitForDisplay(9*StopWatch.NANOS_IN_ONE_MICROSECOND)); + assertEquals(StopWatch.DurationUnit.MICROSECOND, sw.selectDurationUnitForDisplay(11*StopWatch.NANOS_IN_ONE_MICROSECOND)); + assertEquals(StopWatch.DurationUnit.MICROSECOND, sw.selectDurationUnitForDisplay(9*StopWatch.NANOS_IN_ONE_MILLISECOND)); + assertEquals(StopWatch.DurationUnit.MILLISSECOND, sw.selectDurationUnitForDisplay(11*StopWatch.NANOS_IN_ONE_MILLISECOND)); + assertEquals(StopWatch.DurationUnit.MILLISSECOND, sw.selectDurationUnitForDisplay(3*StopWatch.NANOS_IN_ONE_SECOND)); + assertEquals(StopWatch.DurationUnit.SECOND, sw.selectDurationUnitForDisplay(6*StopWatch.NANOS_IN_ONE_SECOND)); + } + }

1 0