This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 79238b71e41c49902ec6426335fe08302920eea2 (commit) from 2931b6cb282e626ee7ff827f8ae02afe5c9e8172 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=79238b71e41c49902ec642633... http://github.com/ceki/logback/commit/79238b71e41c49902ec6426335fe08302920ee... commit 79238b71e41c49902ec6426335fe08302920eea2 Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Apr 24 10:44:27 2012 +0200 added test for LBCORE_254 diff --git a/logback-classic/src/test/input/joran/lbcore193.xml b/logback-classic/src/test/input/joran/issues/lbcore193.xml similarity index 100% rename from logback-classic/src/test/input/joran/lbcore193.xml rename to logback-classic/src/test/input/joran/issues/lbcore193.xml diff --git a/logback-classic/src/test/input/joran/issues/lbcore254.properties b/logback-classic/src/test/input/joran/issues/lbcore254.properties new file mode 100644 index 0000000..985fc4b --- /dev/null +++ b/logback-classic/src/test/input/joran/issues/lbcore254.properties @@ -0,0 +1 @@ +k0=v0 \ No newline at end of file diff --git a/logback-classic/src/test/input/joran/issues/lbcore254.xml b/logback-classic/src/test/input/joran/issues/lbcore254.xml new file mode 100644 index 0000000..7c4b308 --- /dev/null +++ b/logback-classic/src/test/input/joran/issues/lbcore254.xml @@ -0,0 +1,4 @@ +<configuration> + + <property file="${k.lbcore254}.properties"/> +</configuration> \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java new file mode 100644 index 0000000..f2686f4 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java @@ -0,0 +1,34 @@ +package ch.qos.logback.classic.issue; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; +import org.junit.Before; +import org.junit.Test; + +public class LBCORE_254 { + + static String ISSUES_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX+"issues/"; + LoggerContext context = new LoggerContext(); + + StatusChecker checker = new StatusChecker(context); + + @Before + public void setUp() { + context.start(); + } + + @Test + public void sysProps() throws JoranException { + System.setProperty("k.lbcore254", ISSUES_PREFIX+"lbcore254"); + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(context); + configurator.doConfigure(ISSUES_PREFIX+"lbcore254.xml"); + + checker.isErrorFree(0); + + } +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java index e47444f..579280f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java @@ -20,8 +20,9 @@ import org.junit.runners.Suite.SuiteClasses; import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest; @RunWith(Suite.class) -@SuiteClasses( { LB139_DeadlockTest.class, - ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, - ch.qos.logback.classic.issue.lbclassic203.PackageTest.class }) +@SuiteClasses({LB139_DeadlockTest.class, + LBCORE_254.class, + ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, + ch.qos.logback.classic.issue.lbclassic203.PackageTest.class}) public class PackageTest { } \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 22db069..7ac50b6 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -410,7 +410,7 @@ public class JoranConfiguratorTest { @Test public void lbcore193() throws JoranException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "lbcore193.xml"; + + "issues/lbcore193.xml"; configure(configFileAsStr); StatusPrinter.print(loggerContext); sc.containsException(ScanException.class); ----------------------------------------------------------------------- Summary of changes: .../test/input/joran/{ => issues}/lbcore193.xml | 0 .../test/input/joran/issues/lbcore254.properties | 1 + .../src/test/input/joran/issues/lbcore254.xml | 4 ++ .../ch/qos/logback/classic/issue/LBCORE_254.java | 34 ++++++++++++++++++++ .../ch/qos/logback/classic/issue/PackageTest.java | 7 ++-- .../classic/joran/JoranConfiguratorTest.java | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) rename logback-classic/src/test/input/joran/{ => issues}/lbcore193.xml (100%) create mode 100644 logback-classic/src/test/input/joran/issues/lbcore254.properties create mode 100644 logback-classic/src/test/input/joran/issues/lbcore254.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.