- logback-dev - mailman3.qos.ch

svn commit: r1808 - in logback-demo/trunk: . src/main/resources
by noreply.ceki＠qos.ch 11 Sep '08

11 Sep '08

Author: ceki Date: Thu Sep 11 11:33:48 2008 New Revision: 1808 Modified: logback-demo/trunk/pom.xml logback-demo/trunk/src/main/resources/logback.xml Log: - various updates Modified: logback-demo/trunk/pom.xml ============================================================================== --- logback-demo/trunk/pom.xml (original) +++ logback-demo/trunk/pom.xml Thu Sep 11 11:33:48 2008 @@ -9,7 +9,7 @@ <version>1.0</version> <properties> - <lb.version>0.9.9-SNAPSHOT</lb.version> + <lb.version>0.9.10-SNAPSHOT</lb.version> </properties> @@ -34,10 +34,12 @@ <version>${lb.version}</version> <scope>compile</scope> <exclusions> +  </exclusions> </dependency> Modified: logback-demo/trunk/src/main/resources/logback.xml ============================================================================== --- logback-demo/trunk/src/main/resources/logback.xml (original) +++ logback-demo/trunk/src/main/resources/logback.xml Thu Sep 11 11:33:48 2008 @@ -79,7 +79,7 @@ <root> <level value="DEBUG" /> - <appender-ref ref="STDOUT" /> + <appender-ref ref="FILE" /> <appender-ref ref="FILE" />

1 0

svn commit: r1807 - logback/trunk/logback-site/src/site/resources
by noreply.ceki＠qos.ch 11 Sep '08

11 Sep '08

Author: ceki Date: Thu Sep 11 11:32:32 2008 New Revision: 1807 Added: logback/trunk/logback-site/src/site/resources/logback.ppt (contents, props changed) Log: - slides for OpenExpo 08 Added: logback/trunk/logback-site/src/site/resources/logback.ppt ============================================================================== Binary file. No diff available.

1 0

[JIRA] Created: (LBGENERAL-24) Use Geronimo JMS instead of Sun JMS to avoid manual installation
by Thorbjørn Ravn Andersen (JIRA) 09 Sep '08

09 Sep '08

Use Geronimo JMS instead of Sun JMS to avoid manual installation ---------------------------------------------------------------- Key: LBGENERAL-24 URL: http://jira.qos.ch/browse/LBGENERAL-24 Project: logback-general Issue Type: Improvement Components: build-structure Affects Versions: unspecified Reporter: Thorbjørn Ravn Andersen Assignee: Logback dev list Priority: Minor Attachments: logback-change-jms-to-geronimo.patch The Sun JMS implementation is under a click-through license so a manual installation is needed. The Geronimo JMS implementation is in maven, so a fully automatic build is possible. The attached patch change this for the current trunk. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

3 3

svn commit: r1806 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/main/java/ch/qos/logback/classic/pattern logback-classic/src/test/java/ch/qos/logback/classic/spi logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 09 Sep '08

09 Sep '08

Author: ceki Date: Tue Sep 9 13:57:55 2008 New Revision: 1806 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java logback/trunk/logback-site/src/site/pages/manual/layouts.html Log: LBGENERAL-23 Class packaging information is now automatically added to stack traces formatted by PatternLayout Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java Tue Sep 9 13:57:55 2008 @@ -16,6 +16,7 @@ import ch.qos.logback.classic.pattern.EnsureExceptionHandling; import ch.qos.logback.classic.pattern.ClassOfCallerConverter; import ch.qos.logback.classic.pattern.DateConverter; +import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; import ch.qos.logback.classic.pattern.FileOfCallerConverter; import ch.qos.logback.classic.pattern.LevelConverter; import ch.qos.logback.classic.pattern.LineOfCallerConverter; @@ -89,20 +90,25 @@ defaultConverterMap.put("X", MDCConverter.class.getName()); defaultConverterMap.put("mdc", MDCConverter.class.getName()); - defaultConverterMap - .put("ex", ThrowableProxyConverter.class.getName()); + defaultConverterMap.put("ex", ThrowableProxyConverter.class.getName()); defaultConverterMap.put("exception", ThrowableProxyConverter.class .getName()); defaultConverterMap.put("throwable", ThrowableProxyConverter.class .getName()); - + + defaultConverterMap.put("xEx", ExtendedThrowableProxyConverter.class.getName()); + defaultConverterMap.put("xException", ExtendedThrowableProxyConverter.class + .getName()); + defaultConverterMap.put("xThrowable", ExtendedThrowableProxyConverter.class + .getName()); + defaultConverterMap.put("nopex", NopThrowableInformationConverter.class .getName()); defaultConverterMap.put("nopexception", NopThrowableInformationConverter.class.getName()); defaultConverterMap.put("caller", CallerDataConverter.class.getName()); - + defaultConverterMap.put("marker", MarkerConverter.class.getName()); defaultConverterMap.put("n", LineSeparatorConverter.class.getName()); @@ -111,11 +117,11 @@ public PatternLayout() { this.postCompileProcessor = new EnsureExceptionHandling(); } - + public Map<String, String> getDefaultConverterMap() { return defaultConverterMap; } - + public String doLayout(LoggingEvent event) { if (!isStarted()) { return CoreGlobal.EMPTY_STRING; Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/EnsureExceptionHandling.java Tue Sep 9 13:57:55 2008 @@ -5,17 +5,18 @@ import ch.qos.logback.core.pattern.ConverterUtil; import ch.qos.logback.core.pattern.PostCompileProcessor; -public class EnsureExceptionHandling implements PostCompileProcessor<LoggingEvent> { +public class EnsureExceptionHandling implements + PostCompileProcessor<LoggingEvent> { + + // public void process(Converter head) { + // // TODO Auto-generated method stub + // + // } -// public void process(Converter head) { -// // TODO Auto-generated method stub -// -// } - /** * This implementation checks if any of the converters in the chain handles - * exceptions. If not, then this method adds a ThrowableInformationConverter - * instance to the end of the chain. + * exceptions. If not, then this method adds a + * {@link ExtendedThrowableProxyConverter} instance to the end of the chain. * * This allows appenders using this layout to output exception information * event if the user forgets to add %ex to the pattern. Note that the @@ -30,7 +31,7 @@ public void process(Converter<LoggingEvent> head) { if (!chainHandlesThrowable(head)) { Converter<LoggingEvent> tail = ConverterUtil.findTail(head); - Converter<LoggingEvent> exConverter = new ThrowableProxyConverter(); + Converter<LoggingEvent> exConverter = new ExtendedThrowableProxyConverter(); if (tail == null) { head = exConverter; } else { @@ -44,7 +45,7 @@ * not. * * @param head - * The first element of the chain + * The first element of the chain * @return true if can handle throwables contained in logging events */ public boolean chainHandlesThrowable(Converter head) { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java Tue Sep 9 13:57:55 2008 @@ -34,6 +34,24 @@ System.out.println(SystemInfo.getJavaVendor()); } +// @Test +// public void withGreenMail() { +// try { +// ServerSetup serverSetup = new ServerSetup(-1, "localhost", +// ServerSetup.PROTOCOL_SMTP); +// GreenMail greenMail = new GreenMail((ServerSetup) null); +// // greenMail.start(); +// } catch (Throwable e) { +// ThrowableProxy tp = new ThrowableProxy(e); +// ClassPackagingDataCalculator cpdc = tp.getClassPackagingDataCalculator(); +// ThrowableDataPoint[] tdpArray = tp.getThrowableDataPointArray(); +// cpdc.calculate(tdpArray); +// verify(tdpArray); +// tp.fullDump(); +// } +// } + + @Test public void smoke() throws Exception { Throwable t = new Throwable("x"); @@ -42,6 +60,7 @@ ThrowableDataPoint[] tdpArray = tp.getThrowableDataPointArray(); cpdc.calculate(tdpArray); verify(tdpArray); + tp.fullDump(); } @Test Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Tue Sep 9 13:57:55 2008 @@ -292,22 +292,19 @@ customized at will by tweaking the conversion pattern of <code>PatternLayout</code>. - - The conversion pattern of - <code>PatternLayout</code> - is closely related to the conversion pattern of the - <code>printf()</code> - function in the C programming language. A conversion pattern - is composed of literal text and format control expressions - called conversion specifiers. You are free to insert any - literal text within the conversion pattern. Each conversion - specifier starts with a percent sign (%) and is followed by - optional format modifiers, a conversion word and optional - parameters between braces. The - conversion word controls the type of data to use, e.g. - logger name, level, date, thread name. The format modifiers - control such things as field width, padding, and left or - right justification. The following is a simple example. + + The conversion pattern of <code>PatternLayout</code> is closely + related to the conversion pattern of the <code>printf()</code> + function in the C programming language. A conversion pattern is + composed of literal text and format control expressions called + conversion specifiers. You are free to insert any literal text + within the conversion pattern. Each conversion specifier starts + with a percent sign (%) and is followed by optional format + modifiers, a conversion word and optional parameters between + braces. The conversion word controls the type of data to use, e.g. + logger name, level, date, thread name. The format modifiers + control such things as field width, padding, and left or right + justification. The following is a simple example. Example 5.1: Sample usage of a PatternLayout @@ -385,13 +382,13 @@ listed on the left column, they should be considered as aliases. - <table class="bodyTable" border="0" CELLPADDING="8"> + <table class="bodyTable" border="0"> <tr> <th>Conversion Word</th> <th>Effect</th> </tr> - <tr class="b"> + <tr> <td align="center"> c{length} lo{length} @@ -399,17 +396,15 @@ </td> <td> - - Used to output the name of the logger at the origin of the - logging event. + Used to output the name of the logger at the origin of + the logging event. - - This conversion word can take an integer as first and only - option. The converter's abbreviation algorithm will - shorten the logger name, usually without significant loss - of meaning. The next table provides examples of the - abbreviation algorithm in action. + This conversion word can take an integer as first and + only option. The converter's abbreviation algorithm will + shorten the logger name, usually without significant loss of + meaning. The next table provides examples of the + abbreviation algorithm in action. <table class="bodyTable" border="0" cellpadding="8"> @@ -449,7 +444,8 @@ </table> </td> </tr> - <tr class="a"> + + <tr class="alt"> <td align="center"> C{length} class{length} @@ -474,12 +470,12 @@ </td> </tr> - <tr class="b"> - <td align="center"> - d{pattern} - date{pattern} - </td> - <td> + <tr> + <td align="center"> + d{pattern} + date{pattern} + </td> + <td> Used to output the date of the logging event. The date conversion word may be followed by an option enclosed between braces. @@ -521,7 +517,7 @@ </td> </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> F / file </td> @@ -538,7 +534,7 @@ </td> </tr> - <tr class="b"> + <tr> <td align="center"> caller{depth} caller{depth, evaluator-1, ... evaluator-n} @@ -588,7 +584,7 @@ </td> </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> L / line </td> @@ -607,7 +603,7 @@ </tr> - <tr class="b"> + <tr> <td align="center"> m / msg / message </td> @@ -617,7 +613,7 @@ </td> </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> M / method </td> @@ -635,7 +631,7 @@ </td> </tr> - <tr class="b"> + <tr> <td align="center"> n </td> @@ -656,14 +652,14 @@ </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> p / le / level </td> <td>Used to output the level of the logging event.</td> </tr> - <tr class="b"> + <tr> <td align="center"> r / relative @@ -677,7 +673,7 @@ </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> t / thread </td> @@ -689,7 +685,7 @@ </tr> - <tr class="b"> + <tr> <td align="center"> X{key} mdc{key} @@ -718,7 +714,7 @@ </td> </tr> - <tr class="a"> + <tr class="alt"> <td align="center"> ex{length} exception{length} @@ -748,14 +744,14 @@ the following options: <ul> - short: prints the first line of the stack trace - full: prints the full stack trace - Any integer: prints the given number of lines of the stack trace + <li>short: prints the first line of the stack trace</li> + <li>full: prints the full stack trace</li> + <li>Any integer: prints the given number of lines of the stack trace</li> </ul> Here are some examples: - <table class="bodyTable" CELLPADDING="8"> + <table class="bodyTable"> <tr class="a"> <th>Conversion Pattern</th> <th>Result</th> @@ -787,17 +783,75 @@ </tr> </table> - - This conversion word can also use evaluators to test logging events - against a given criteria before creating the output. For example, - using %ex{full, EX_DISPLAY_EVAL} will display the full - stacktrace of the exception, only if the evaluator called EX_DISPLAY_EVAL - returns a negative answer. Evaluators are described - further down in this document. + This conversion word can also use evaluators to test + logging events against a given criteria before creating the + output. For example, using %ex{full, EX_DISPLAY_EVAL} + will display the full stacktrace of the exception, only if + the evaluator called EX_DISPLAY_EVAL returns a + negative answer. Evaluators are described further + down in this document. </td> </tr> + + <tr> + <td align="center"> + xEx{length} + xException{length} + xThrowable{length} + + xEx{length, evaluator-1, ..., evaluator-n} + xException{length, evaluator-1, ..., evaluator-n} + xThrowable{length, evaluator-1, ..., evaluator-n} + </td> + + <td> + Same as the %exception conversion keyword with the + addition of class packaging information. + + At the end of each stack frame of the exception, a string + consisting of the jar file containing the relevant class + followed by the "Implementation-Version" as found in that + jar's manifest will be added. This innovative technique was + <a + href="http://macstrac.blogspot.com/2008/09/better-stack-traces-in-java-with-log4j…">suggested + by James Strachan</a>. If the information is uncertain, then + the class packaging data will be preceded by a tilde, i.e. + the '~' character. + + + Here is an example: + + java.lang.NullPointerException + at com.xyz.Wombat(Wombat.java:57) ~[wombat-1.3.jar:1.3] + at com.xyz.Wombat(Wombat.java:76) ~[wombat-1.3.jar:1.3] + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.5.0_06] + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) ~[na:1.5.0_06] + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) ~[na:1.5.0_06] + at java.lang.reflect.Method.invoke(Method.java:585) ~[na:1.5.0_06] + at org.junit.internal.runners.TestMethod.invoke(TestMethod.java:59) [junit-4.4.jar:na] + at org.junit.internal.runners.MethodRoadie.runTestMethod(MethodRoadie.java:98) [junit-4.4.jar:na] + ...etc + + Logback goes to great lengths to ensure that the class + packaging information it displays is correct, even in + arbirarily complex class loader hierarchies. However, when + it is not able to guarantee the absolute correctness of the + information, then it will prefix the data with a tilde, i.e. + the '~' character. Thus, it is theoretically possible for + the printed class packaging information to differ from the + real class packaging information. So, in the above example, + given that packaging data for the Wombat class is preceded + by a tilde, it possible that the correct packaging data is + in reality [wombat.jar:1.7]. + + + </td> + + + </tr> + <tr class="b"> <td align="center"> nopex

1 0

svn commit: r1805 - in logback/trunk/logback-site/src/site/pages: . manual
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 22:43:57 2008 New Revision: 1805 Modified: logback/trunk/logback-site/src/site/pages/manual/introduction.html logback/trunk/logback-site/src/site/pages/news.html Log: Documentation improvements (work in progress) Modified: logback/trunk/logback-site/src/site/pages/manual/introduction.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/introduction.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/introduction.html Mon Sep 8 22:43:57 2008 @@ -244,20 +244,7 @@ including all its modules, should be as easy as issuing a <code>mvn package</code> command from within the directory where you unarchived the logback distribution. Maven will automatically - download the required external libraries. However, certain artefacts - cannot be downloaded from the Maven2 repository. At present, time - only the JMS API from from SUN Inc. needs to be downloaded and - installed separately into your local repository. - - - You can manually download the <a - href="http://java.sun.com/products/jms/docs.html">JMS API from - Sun</a>. Once you have downloaded the jms.jar file, you can - install it in your local Maven 2 repository by issuing the command: - - - mvn install:install-file -DgroupId=javax.jms -DartifactId=jms -Dversion=1.1 / - -Dpackaging=jar -Dfile=/path/to/jms.jar.file + download the required external libraries. Logback distributions contain complete source code such that you @@ -266,8 +253,34 @@ adhere to the conditions of the LGPL License. + Logback has been built and tested with the follwing JDKs. - + <table class="bodyTable"> + <tr> + <th>JDK</th> + <th>Operating System</th> + </tr> + + <tr> + <td>Sun JDK 1.5.0.06</td> + <td>Windows XP</td> + </tr> + + <tr class="alt"> + <td>Sun JDK 1.5.0.08</td> + <td>Linux 64bit AMD</td> + </tr> + + <tr> + <td>WebLogic JRockit 1.5.0.14</td> + <td>Linux 64bit AMD</td> + </tr> + + <tr class="alt"> + <td>IBM JDK 1.6.0.1</td> + <td>Linux 64bit AMD</td> + </tr> + </table> <script src="../templates/footer.js"></script> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Mon Sep 8 22:43:57 2008 @@ -83,6 +83,28 @@ subject line. + + Fixed issue <a + href="http://jira.qos.ch/browse/LBCLASSIC-68">LBCLASSIC-68</a> + reported by Gili Tzabari. In environments where the TCCL (Thread + Context Class Laoder) was not set, logback was unable to located its + default configuraiton files. Logback now uses the class loader that + loaded logback itself to locate its resources instead of the + TCCL. This approach is simpler and deemed to cover more + environments, i.e. more widely applicable. + + + + Fixed issue <a + href="http://jira.qos.ch/browse/LBGENERAL-24">LBGENERAL-24</a> + reported by Thorbjørn Ravn Andersen. Logback now relies on + Geronimo JMS API specifications instead of Sun's JMS API + specification, the latter requiring manual installation. With + Geronimo JMS, logback can be built using Maven without needing to + manually install any dependencies. + + + <a href="http://jira.qos.ch/browse/LBCORE-32">LBCORE-32</a>

1 0

svn commit: r1804 - in logback/trunk: . logback-classic logback-core
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 22:33:25 2008 New Revision: 1804 Modified: logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/pom.xml Log: LBGENERAL-24 Not using Geronimo JMS instead of Sun JMS to avoid manual installation Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Sep 8 22:33:25 2008 @@ -94,12 +94,16 @@ </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> <optional>true</optional> </dependency> + + + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Mon Sep 8 22:33:25 2008 @@ -46,8 +46,8 @@ <optional>true</optional> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> <optional>true</optional> </dependency> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Sep 8 22:33:25 2008 @@ -118,12 +118,12 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> <version>6.1.1</version> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.0</version> + </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId>

1 0

svn commit: r1803 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 21:55:38 2008 New Revision: 1803 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java Log: sometimes the scenario queue gets empty before it is supposed to this change reduces the probability of that happening Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java Mon Sep 8 21:55:38 2008 @@ -45,6 +45,11 @@ // add an empty string to get going queue.add(""); + // add another string to reduce the probability of having an + // empty queue (this happens when we create several leaf nodes + // successively + queue.add("xxxx"); + while (loggerCreationCount < len) { if (queue.isEmpty()) { throw new IllegalStateException("Queue cannot be empty.");

1 0

svn commit: r1802 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 21:26:55 2008 New Revision: 1802 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Log: convert to a JUnit4 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java Mon Sep 8 21:26:55 2008 @@ -9,36 +9,39 @@ */ package ch.qos.logback.classic; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Iterator; import java.util.List; import java.util.Map; -import junit.framework.TestCase; +import org.junit.Test; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.control.ControlAction; import ch.qos.logback.classic.control.ControlLogger; import ch.qos.logback.classic.control.ControlLoggerContext; import ch.qos.logback.classic.control.CreateLogger; import ch.qos.logback.classic.control.Scenario; import ch.qos.logback.classic.control.ScenarioMaker; import ch.qos.logback.classic.control.SetLevel; -import ch.qos.logback.classic.control.ControlAction; -public class DynamicLoggerContextTest extends TestCase { +public class DynamicLoggerContextTest { LoggerContext lc; - + + @Test public void test3() { dynaTest(3); } + @Test public void test30() { dynaTest(30); } + @Test public void test1000() { dynaTest(1000); } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Mon Sep 8 21:26:55 2008 @@ -17,7 +17,7 @@ TestSuite suite = new TestSuite(); suite.addTestSuite(LoggerContextTest.class); suite.addTestSuite(LoggerPerfTest.class); - suite.addTestSuite(DynamicLoggerContextTest.class); + suite.addTest(new JUnit4TestAdapter(DynamicLoggerContextTest.class)); suite.addTestSuite(PatternLayoutTest.class); suite.addTestSuite(BasicLoggerTest.class); suite.addTestSuite(MessageFormattingTest.class);

1 0

svn commit: r1801 - in logback/trunk/logback-classic: . src/test/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 21:22:04 2008 New Revision: 1801 Modified: logback/trunk/logback-classic/ (props changed) logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java Log: be more lenient with non Sun JVMs Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicCPDCTest.java Mon Sep 8 21:22:04 2008 @@ -28,11 +28,12 @@ } } } - - @Test public void otherJD() { + + @Test + public void otherJD() { System.out.println(SystemInfo.getJavaVendor()); } - + @Test public void smoke() throws Exception { Throwable t = new Throwable("x"); @@ -87,8 +88,17 @@ double d1 = loop(len, true); System.out.println("with packaging info " + d1 + " microseconds"); - assertTrue("computing class packaging data (" + d1 - + ") should have been less than six times the time it takes to process an exception " + (d0 * 6), - d0 * 6 > d1); + + int slackFactor = 6; + if (!SystemInfo.getJavaVendor().contains("Sun")) { + // be more lenient with other JDKs + slackFactor = 10; + } + assertTrue( + "computing class packaging data (" + + d1 + + ") should have been less than "+slackFactor+" times the time it takes to process an exception " + + (d0 * slackFactor), d0 * slackFactor > d1); + } }

1 0

svn commit: r1800 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . pattern
by noreply.ceki＠qos.ch 08 Sep '08

08 Sep '08

Author: ceki Date: Mon Sep 8 20:55:30 2008 New Revision: 1800 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java Log: - ensuring that tests pass with IBM's JDK Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Mon Sep 8 20:55:30 2008 @@ -9,22 +9,19 @@ */ package ch.qos.logback.classic; +import static ch.qos.logback.classic.TestConstants.ISO_REGEX; +import static ch.qos.logback.classic.TestConstants.MAIN_REGEX; + import java.util.ArrayList; import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; - -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.pattern.ConverterTest; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.pattern.PatternLayoutBase; import ch.qos.logback.core.pattern.parser.AbstractPatternLayoutBaseTest; -import static ch.qos.logback.classic.TestConstants.*; public class PatternLayoutTest extends AbstractPatternLayoutBaseTest { @@ -81,13 +78,13 @@ public void testCompositePattern() { PatternLayout pl = new PatternLayout(); - pl.setPattern("%-56(%d [%t] %lo{20}) - %m%n"); + pl.setPattern("%-56(%d %lo{20}) - %m%n"); Context context = new LoggerContext(); pl.setContext(context); pl.start(); String val = pl.doLayout(getEventObject()); - // 2008-03-18 21:55:54,250 [main] c.q.l.c.pattern.ConverterTest - Some message - String regex = ISO_REGEX+" "+MAIN_REGEX+" c.q.l.c.p.ConverterTest - Some message\\s*"; + // 2008-03-18 21:55:54,250 c.q.l.c.pattern.ConverterTest - Some message + String regex = ISO_REGEX+" c.q.l.c.p.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java Mon Sep 8 20:55:30 2008 @@ -7,24 +7,25 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.util.SystemInfo; public class MDCConverterTest extends TestCase { - + LoggerContext lc; MDCConverter converter; - + public void setUp() throws Exception { lc = new LoggerContext(); converter = new MDCConverter(); converter.start(); } - + public void tearDown() throws Exception { lc = null; converter.stop(); converter = null; } - + public void testConverWithOneEntry() { MDC.clear(); MDC.put("testKey", "testValue"); @@ -39,12 +40,17 @@ MDC.put("testKey2", "testValue2"); LoggingEvent le = createLoggingEvent(); String result = converter.convert(le); - assertEquals("testKey=testValue, testKey2=testValue2", result); + if (SystemInfo.getJavaVendor().contains("IBM")) { + assertEquals("testKey2=testValue2, testKey=testValue", result); + } else { + assertEquals("testKey=testValue, testKey2=testValue2", result); + } } - + private LoggingEvent createLoggingEvent() { - LoggingEvent le = new LoggingEvent(this.getClass().getName(), lc.getLogger(LoggerContext.ROOT_NAME), - Level.DEBUG, "test message", null, null); + LoggingEvent le = new LoggingEvent(this.getClass().getName(), lc + .getLogger(LoggerContext.ROOT_NAME), Level.DEBUG, "test message", null, + null); return le; } }

1 0