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 4a2525be2fc34ffb6fcf3b0de8d0e01d821440fd (commit) via 43072a410f56e2340d3ebc1f5bfeddd2324930cb (commit) from 79238b71e41c49902ec6426335fe08302920eea2 (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=4a2525be2fc34ffb6fcf3b0de... http://github.com/ceki/logback/commit/4a2525be2fc34ffb6fcf3b0de8d0e01d821440... commit 4a2525be2fc34ffb6fcf3b0de8d0e01d821440fd Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Apr 24 10:57:54 2012 +0200 comments 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 a63a070..ec0f635 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 @@ -437,6 +437,7 @@ public class JoranConfiguratorTest { } + // see also http://jira.qos.ch/browse/LBCORE-254 @Test public void sysProps() throws JoranException { System.setProperty("k.lbcore254", ClassicTestConstants.ISSUES_PREFIX+"lbcore254"); @@ -445,6 +446,5 @@ public class JoranConfiguratorTest { configurator.doConfigure(ClassicTestConstants.ISSUES_PREFIX+"lbcore254.xml"); checker.isErrorFree(0); - - } + } } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=43072a410f56e2340d3ebc1f5... http://github.com/ceki/logback/commit/43072a410f56e2340d3ebc1f5bfeddd2324930... commit 43072a410f56e2340d3ebc1f5bfeddd2324930cb Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Apr 24 10:54:07 2012 +0200 move lbcore-254 related tests diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java index 39ac65f..2bf6282 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java @@ -24,6 +24,7 @@ public class ClassicTestConstants { final static public String MAIN_REGEX = "\\[" + NAKED_MAIN_REGEX + "\\]"; final static public String INPUT_PREFIX = "src/test/input/"; final static public String JORAN_INPUT_PREFIX = INPUT_PREFIX + "joran/"; + final static public String ISSUES_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX+"issues/"; final static public String GAFFER_INPUT_PREFIX = INPUT_PREFIX + "gaffer/"; final static public String OUTPUT_DIR_PREFIX= CoreTestConstants.OUTPUT_DIR_PREFIX; } 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 deleted file mode 100644 index f2686f4..0000000 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java +++ /dev/null @@ -1,34 +0,0 @@ -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 579280f..fdd41f5 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 @@ -21,7 +21,6 @@ import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest @RunWith(Suite.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 { 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 7ac50b6..a63a070 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 @@ -54,7 +54,7 @@ public class JoranConfiguratorTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); - StatusChecker sc = new StatusChecker(loggerContext); + StatusChecker checker = new StatusChecker(loggerContext); int diff = RandomUtil.getPositiveInt(); void configure(String file) throws JoranException { @@ -409,13 +409,12 @@ public class JoranConfiguratorTest { @Test public void lbcore193() throws JoranException { - String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "issues/lbcore193.xml"; + String configFileAsStr = ClassicTestConstants.ISSUES_PREFIX + "lbcore193.xml"; configure(configFileAsStr); - StatusPrinter.print(loggerContext); - sc.containsException(ScanException.class); - sc.containsMatch(Status.ERROR, "Expecting RIGHT_PARENTHESIS token but got null"); - sc.containsMatch(Status.ERROR, "See also " + Parser.MISSING_RIGHT_PARENTHESIS); + //StatusPrinter.print(loggerContext); + checker.containsException(ScanException.class); + checker.containsMatch(Status.ERROR, "Expecting RIGHT_PARENTHESIS token but got null"); + checker.containsMatch(Status.ERROR, "See also " + Parser.MISSING_RIGHT_PARENTHESIS); } @@ -433,7 +432,19 @@ public class JoranConfiguratorTest { assertEquals("node0", loggerContext.getProperty("nodeId")); assertEquals("tem", System.getProperty("sys")); assertNotNull(loggerContext.getProperty("path")); - assertTrue(sc.isErrorFree(0)); + assertTrue(checker.isErrorFree(0)); StatusPrinter.print(loggerContext); } + + + @Test + public void sysProps() throws JoranException { + System.setProperty("k.lbcore254", ClassicTestConstants.ISSUES_PREFIX+"lbcore254"); + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(loggerContext); + configurator.doConfigure(ClassicTestConstants.ISSUES_PREFIX+"lbcore254.xml"); + + checker.isErrorFree(0); + + } } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/classic/ClassicTestConstants.java | 1 + .../ch/qos/logback/classic/issue/LBCORE_254.java | 34 -------------------- .../ch/qos/logback/classic/issue/PackageTest.java | 1 - .../classic/joran/JoranConfiguratorTest.java | 27 +++++++++++----- 4 files changed, 20 insertions(+), 43 deletions(-) delete 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.