March 2008 - logback-dev - mailman3.qos.ch

svn commit: r1641 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/net test/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 11 Mar '08

11 Mar '08

Author: ceki Date: Tue Mar 11 10:43:47 2008 New Revision: 1641 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java - copied, changed from r1638, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LuckyCharms.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Log: - ongoing work for fixing bug 100 http://bugzilla.qos.ch/show_bug.cgi?id=100 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Tue Mar 11 10:43:47 2008 @@ -47,6 +47,9 @@ */ private static final long serialVersionUID = 3022264832697160750L; + private static final int NULL_ARGUMENT_ARRAY = -1; + private static final String NULL_ARGUMENT_ARRAY_ELEMENT = "NULL_ARGUMENT_ARRAY_ELEMENT"; + /** * */ @@ -80,7 +83,7 @@ private String message; private String formattedMessage; - private Object[] argumentArray; + private transient Object[] argumentArray; private ThrowableInformation throwableInfo; @@ -113,7 +116,7 @@ // bug 85 (we previously failed to set this.argumentArray) this.argumentArray = argArray; - + if (argArray != null) { formattedMessage = MessageFormatter.arrayFormat(message, argArray); } else { @@ -122,7 +125,8 @@ timeStamp = System.currentTimeMillis(); // the case is ugly but under the circumstances acceptable - LogbackMDCAdapter logbackMDCAdapter = (LogbackMDCAdapter) MDC.getMDCAdapter(); + LogbackMDCAdapter logbackMDCAdapter = (LogbackMDCAdapter) MDC + .getMDCAdapter(); mdcPropertyMap = logbackMDCAdapter.getPropertyMap(); } @@ -185,13 +189,13 @@ * This method should be called prior to serializing an event. It should also * be called when using asynchronous logging. * - * <p>Note that due to performance concerns, this method does NOT extract - * caller data. It is the responsability of the calller to extract caller + * <p> + * Note that due to performance concerns, this method does NOT extract caller + * data. It is the responsability of the calller to extract caller * information. */ public void prepareForDeferredProcessing() { this.getThreadName(); - } public LoggerRemoteView getLoggerRemoteView() { @@ -286,6 +290,20 @@ private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); out.writeInt(level.levelInt); + if (argumentArray != null) { + int len = argumentArray.length; + out.writeInt(len); + for (int i = 0; i < argumentArray.length; i++) { + if (argumentArray[i] != null) { + out.writeUTF(argumentArray[i].toString()); + } else { + out.writeUTF(NULL_ARGUMENT_ARRAY_ELEMENT); + } + } + } else { + out.writeInt(NULL_ARGUMENT_ARRAY); + } + } private void readObject(ObjectInputStream in) throws IOException, @@ -293,8 +311,19 @@ in.defaultReadObject(); int levelInt = in.readInt(); level = Level.toLevel(levelInt); + + int argArrayLen = in.readInt(); + if (argArrayLen != NULL_ARGUMENT_ARRAY) { + argumentArray = new String[argArrayLen]; + for (int i = 0; i < argArrayLen; i++) { + String val = in.readUTF(); + if (!NULL_ARGUMENT_ARRAY_ELEMENT.equals(val)) { + argumentArray[i] = val; + } + } + } } - + @Override public String toString() { StringBuffer sb = new StringBuffer('['); @@ -303,5 +332,4 @@ sb.append("\n"); return sb.toString(); } - } Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java (from r1638, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Tue Mar 11 10:43:47 2008 @@ -1,4 +1,8 @@ -package ch.qos.logback.classic.net; +package ch.qos.logback.classic.spi; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -6,18 +10,16 @@ import java.io.ObjectOutputStream; import java.util.Map; -import junit.framework.TestCase; - +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.slf4j.MDC; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.LoggerContextRemoteView; -import ch.qos.logback.classic.spi.LoggerRemoteView; -import ch.qos.logback.classic.spi.LoggingEvent; -public class LoggingEventSerializationTest extends TestCase { +public class LoggingEventSerializationTest { LoggerContext lc; Logger logger; @@ -26,24 +28,26 @@ ObjectOutputStream oos; ObjectInputStream inputStream; + @Before public void setUp() throws Exception { - super.setUp(); lc = new LoggerContext(); lc.setName("testContext"); logger = lc.getLogger(LoggerContext.ROOT_NAME); + // create the byte output stream + bos = new ByteArrayOutputStream(); + oos = new ObjectOutputStream(bos); } + + @After public void tearDown() throws Exception { - super.tearDown(); + lc = null; logger = null; } + @Test public void testBasic() throws Exception { - // create the byte output stream - bos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(bos); - LoggingEvent event = createLoggingEvent(); oos.writeObject(event); @@ -57,11 +61,8 @@ assertEquals(Level.DEBUG, remoteEvent.getLevel()); } + @Test public void testContext() throws Exception { - // create the byte output stream - bos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(bos); - lc.putProperty("testKey", "testValue"); LoggingEvent event = createLoggingEvent(); oos.writeObject(event); @@ -85,11 +86,8 @@ assertEquals("testValue", props.get("testKey")); } + @Test public void testMDC() throws Exception { - // create the byte output stream - bos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(bos); - MDC.put("key", "testValue"); LoggingEvent event = createLoggingEvent(); oos.writeObject(event); @@ -104,11 +102,8 @@ assertEquals("testValue", MDCPropertyMap.get("key")); } + @Test public void testUpdatedMDC() throws Exception { - // create the byte output stream - bos = new ByteArrayOutputStream(); - oos = new ObjectOutputStream(bos); - MDC.put("key", "testValue"); LoggingEvent event1 = createLoggingEvent(); oos.writeObject(event1); @@ -131,6 +126,28 @@ assertEquals("updatedTestValue", MDCPropertyMap.get("key")); } + @Test + public void nonSerializableParameters() throws Exception { + LoggingEvent event = createLoggingEvent(); + LuckyCharms lucky0 = new LuckyCharms(0); + event.setArgumentArray(new Object[] {lucky0, null}); + oos.writeObject(event); + + // create the input stream based on the ouput stream + ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); + inputStream = new ObjectInputStream(bis); + + LoggingEvent remoteEvent = (LoggingEvent) inputStream.readObject(); + + Object[] aa = remoteEvent.getArgumentArray(); + assertNotNull(aa); + assertEquals(2, aa.length); + assertEquals("LC(0)", aa[0]); + assertNull(aa[1]); + } + + + private LoggingEvent createLoggingEvent() { LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "test message", null, null); Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LuckyCharms.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LuckyCharms.java Tue Mar 11 10:43:47 2008 @@ -0,0 +1,15 @@ +package ch.qos.logback.classic.spi; + +// non serializable object +public class LuckyCharms { + int id; + + LuckyCharms(int id) { + this.id= id; + } + + @Override + public String toString() { + return "LC("+id+")"; + } +}

1 0

svn commit: r1640 - in logback/trunk/logback-core/src/test/input/joran: implcitAction implicitAction
by noreply.ceki＠qos.ch 11 Mar '08

11 Mar '08

Author: ceki Date: Tue Mar 11 09:23:19 2008 New Revision: 1640 Added: logback/trunk/logback-core/src/test/input/joran/implicitAction/ - copied from r1639, /logback/trunk/logback-core/src/test/input/joran/implcitAction/ Removed: logback/trunk/logback-core/src/test/input/joran/implcitAction/ Log: - typo fix

1 0

svn commit: r1639 - logback/trunk/logback-classic/src/test/resources
by noreply.ceki＠qos.ch 11 Mar '08

11 Mar '08

Author: ceki Date: Tue Mar 11 09:20:50 2008 New Revision: 1639 Modified: logback/trunk/logback-classic/src/test/resources/logback-test.xml Log: - less noise in tests is good Modified: logback/trunk/logback-classic/src/test/resources/logback-test.xml ============================================================================== --- logback/trunk/logback-classic/src/test/resources/logback-test.xml (original) +++ logback/trunk/logback-classic/src/test/resources/logback-test.xml Tue Mar 11 09:20:50 2008 @@ -9,7 +9,7 @@ </appender> <root> - <level value="debug" /> + <level value="ERROR" /> <appender-ref ref="STDOUT" /> </root> </configuration> \ No newline at end of file

1 0

svn commit: r1638 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 11 Mar '08

11 Mar '08

Author: ceki Date: Tue Mar 11 09:16:23 2008 New Revision: 1638 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - Give the server more time to consume the message. This changed is needed on Linux platforms Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Tue Mar 11 09:16:23 2008 @@ -190,9 +190,9 @@ synchronized (simpleSocketServer) { simpleSocketServer.wait(1000); } - // give the server a little more time - Thread.yield(); + Thread.yield(); // give the server a little more time logger.debug("test msg 2"); + Thread.yield(); // give the server a little more time simpleSocketServer.close(); simpleSocketServer.join(2000); @@ -213,6 +213,7 @@ root.addAppender(la); simpleSocketServer = new SimpleSocketServer(serverLC, port); simpleSocketServer.start(); + Thread.yield(); }

1 0

svn commit: r1637 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 11 Mar '08

11 Mar '08

Author: ceki Date: Tue Mar 11 09:05:12 2008 New Revision: 1637 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - For the SocketAppenderTest#launchLateServer test to pass, the socketAppender's reconnection delay parameter has to be set. Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Tue Mar 11 09:05:12 2008 @@ -32,10 +32,11 @@ public class SocketAppenderTest { static final String LIST_APPENDER_NAME = "la"; - int port = 4560; + int port = 4561; LoggerContext lc = new LoggerContext(); LoggerContext serverLC = new LoggerContext(); ListAppender<LoggingEvent> la = new ListAppender<LoggingEvent>(); + SocketAppender socketAppender = new SocketAppender(); private SimpleSocketServer simpleSocketServer; @@ -180,6 +181,7 @@ @Test public void lateServerLaunch() throws InterruptedException { + socketAppender.setReconnectionDelay(20); configureClient(); Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("test msg"); @@ -188,14 +190,13 @@ synchronized (simpleSocketServer) { simpleSocketServer.wait(1000); } + // give the server a little more time + Thread.yield(); logger.debug("test msg 2"); - StatusPrinter.print(lc); - - // Wait max 2 seconds for mock server to finish. However, it should - // finish much sooner than that. simpleSocketServer.close(); simpleSocketServer.join(2000); + StatusPrinter.print(lc); assertTrue(simpleSocketServer.isClosed()); assertEquals(1, la.list.size()); @@ -212,10 +213,6 @@ root.addAppender(la); simpleSocketServer = new SimpleSocketServer(serverLC, port); simpleSocketServer.start(); - //mockSocketServer = new MockSocketServer(expectedNumberOfEvents); - //mockSocketServer.start(); - // give MockSocketServer head start - Thread.sleep(100); } @@ -229,7 +226,6 @@ lc.setName("test"); lc.putProperty("testKey", "testValue"); Logger root = lc.getLogger(LoggerContext.ROOT_NAME); - SocketAppender socketAppender = new SocketAppender(); socketAppender.setContext(lc); socketAppender.setName("socket"); socketAppender.setPort(port);

1 0

[Bug 135] New: FixedWindowRollingPolicy MAX_WINDOW_SIZE too small?
by bugzilla-daemon＠pixie.qos.ch 08 Mar '08

08 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=135 Summary: FixedWindowRollingPolicy MAX_WINDOW_SIZE too small? Product: logback-core Version: unspecified Platform: All OS/Version: Windows Status: NEW Severity: enhancement Priority: P5 Component: Rolling AssignedTo: logback-dev(a)qos.ch ReportedBy: Michael_Mansell(a)yahoo.com I know it's not a blog but let me first say I've switched from log time use of JCL / log4j and think SLF4J / Logback is awesome so kudos to you guys for getting this out here... simple and powerful.. not much to not like ;-) I'm curious as to why a window size as small as 12 was chosen here. I realize the renaming of all files within the window gets more expensive as the window increases but it seems prohibitive for people with larger logging requirements. Moreover, the fact that it is final means I can't override this either although I realize it is rather trivial to build my own implementation. I have a project that generates a tremendous amount of logging currently (about 100MB every 6 minutes) and in my current setup have issues with files over 2GB. With the current MAX_WINDOW_SIZE I can only keep a days worth of logs! If the rename is a big deal a rolling policy that just uses the index as a cyclic sequence should work fine or are there other reasons to cap this at something so low? I could submit an implementation back if you like but just curious to get your feedback and any reasoning I might be missing on keeping the window size so low. Thanks again for a great product! -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 0

svn commit: r1634 - logback/trunk/logback-core/src/test/input/joran/implcitAction
by noreply.ceki＠qos.ch 05 Mar '08

05 Mar '08

Author: ceki Date: Wed Mar 5 14:32:06 2008 New Revision: 1634 Added: logback/trunk/logback-core/src/test/input/joran/implcitAction/ logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponent.xml logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponentCollection.xml Log: - added a new test, checking the configuration of nested collection of complex objects Added: logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponent.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponent.xml Wed Mar 5 14:32:06 2008 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<context> + <fruit class="ch.qos.logback.core.joran.implicitAction.Fruit"> + <name>blue</name> + <text>hello</text> + <text>world</text> + </fruit> +</context> \ No newline at end of file Added: logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponentCollection.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/implcitAction/nestedComponentCollection.xml Wed Mar 5 14:32:06 2008 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<context> + <fruit class="ch.qos.logback.core.joran.implicitAction.Fruit"> + <name>blue</name> + <text>hello</text> + <text>world</text> + <cake class="ch.qos.logback.core.joran.implicitAction.Cake"> + <type>A</type> + <code>1</code> + </cake> + <cake class="ch.qos.logback.core.joran.implicitAction.Cake"> + <type>B</type> + <code>2</code> + </cake> + </fruit> +</context> \ No newline at end of file

1 0

svn commit: r1633 - in logback/trunk/logback-core/src/test: input/joran java/ch/qos/logback/core/joran/implicitAction
by noreply.ceki＠qos.ch 05 Mar '08

05 Mar '08

Author: ceki Date: Wed Mar 5 14:31:06 2008 New Revision: 1633 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Cake.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java - copied, changed from r1632, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Removed: logback/trunk/logback-core/src/test/input/joran/simplePropertyIA1.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java Log: - added a new test, checking the configuration of nested collection of complex objects Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Cake.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Cake.java Wed Mar 5 14:31:06 2008 @@ -0,0 +1,22 @@ +package ch.qos.logback.core.joran.implicitAction; + +public class Cake { + + String type; + int code; + + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + + +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java Wed Mar 5 14:31:06 2008 @@ -7,6 +7,7 @@ String name; List<String> textList = new ArrayList<String>(); + List<Cake> cakeList = new ArrayList<Cake>(); public Fruit() { } @@ -23,4 +24,7 @@ textList.add(s); } + public void addCake(Cake c) { + cakeList.add(c); + } } Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java (from r1632, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java Wed Mar 5 14:31:06 2008 @@ -1,42 +1,44 @@ package ch.qos.logback.core.joran.implicitAction; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.util.HashMap; import java.util.List; -import junit.framework.TestCase; +import org.junit.Before; +import org.junit.Test; + import ch.qos.logback.core.joran.SimpleConfigurator; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; import ch.qos.logback.core.util.StatusPrinter; -public class SimplePropertyIATest extends TestCase { +public class ImplicitActionTest { + static final String IMPLCIT_DIR = Constants.TEST_DIR_PREFIX +"input/joran/implicitAction/"; + FruitContext fruitContext = new FruitContext(); + SimpleConfigurator simpleConfigurator; - public SimplePropertyIATest(String arg0) { - super(arg0); + public ImplicitActionTest() { } - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { fruitContext.setName("fruits"); + HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); + rulesMap.put(new Pattern("/context/"), new FruitContextAction()); + simpleConfigurator = new SimpleConfigurator(rulesMap); + simpleConfigurator.setContext(fruitContext); } - protected void tearDown() throws Exception { - super.tearDown(); - } - - public void test() throws Exception { + @Test + public void nested() throws Exception { try { - HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); - rulesMap.put(new Pattern("/context/"), new FruitContextAction()); - SimpleConfigurator simpleConfigurator = new SimpleConfigurator(rulesMap); - - simpleConfigurator.setContext(fruitContext); - - simpleConfigurator.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/" - + "simplePropertyIA1.xml"); + simpleConfigurator.doConfigure(IMPLCIT_DIR + "nestedComponent.xml"); + List<Fruit> fList = fruitContext.getFruitList(); assertNotNull(fList); assertEquals(1, fList.size()); @@ -46,11 +48,35 @@ assertEquals(2, f0.textList.size()); assertEquals("hello", f0.textList.get(0)); assertEquals("world", f0.textList.get(1)); + } catch (Exception je) { StatusPrinter.print(fruitContext); throw je; } } + @Test + public void nestedCollection() throws Exception { + try { + simpleConfigurator.doConfigure(IMPLCIT_DIR + "nestedComponentCollection.xml"); + + List<Fruit> fList = fruitContext.getFruitList(); + assertNotNull(fList); + assertEquals(1, fList.size()); + + Fruit f0 = fList.get(0); + assertEquals(2, f0.cakeList.size()); + + Cake cakeA = f0.cakeList.get(0); + assertEquals("A", cakeA.getType()); + + Cake cakeB = f0.cakeList.get(1); + assertEquals("B", cakeB.getType()); + + } catch (Exception je) { + StatusPrinter.print(fruitContext); + throw je; + } + } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java Wed Mar 5 14:31:06 2008 @@ -9,6 +9,7 @@ */ package ch.qos.logback.core.joran.implicitAction; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -17,7 +18,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(SimplePropertyIATest.class); + suite.addTest(new JUnit4TestAdapter(ImplicitActionTest.class)); return suite; } }

1 0

svn commit: r1632 - in logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran: . action action/ext ia implicitAction
by noreply.ceki＠qos.ch 05 Mar '08

05 Mar '08

Author: ceki Date: Wed Mar 5 14:02:32 2008 New Revision: 1632 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java - copied, changed from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ - copied from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/ Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/ Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Log: - Moved certain test actions into c/q/l/core/joran/action/ext - renamed c.q.l.c.j.action.ia as c.q.l.c.j.action.implicitAction Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java Wed Mar 5 14:02:32 2008 @@ -23,7 +23,7 @@ suite.addTest(ch.qos.logback.core.joran.event.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.spi.PackageTest.suite()); suite.addTest(ch.qos.logback.core.joran.replay.PackageTest.suite()); - suite.addTest(ch.qos.logback.core.joran.ia.PackageTest.suite()); + suite.addTest(ch.qos.logback.core.joran.implicitAction.PackageTest.suite()); return suite; } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Wed Mar 5 14:02:32 2008 @@ -20,11 +20,11 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.action.BadBeginAction; -import ch.qos.logback.core.joran.action.BadEndAction; -import ch.qos.logback.core.joran.action.HelloAction; import ch.qos.logback.core.joran.action.NOPAction; -import ch.qos.logback.core.joran.action.TouchAction; +import ch.qos.logback.core.joran.action.ext.BadBeginAction; +import ch.qos.logback.core.joran.action.ext.BadEndAction; +import ch.qos.logback.core.joran.action.ext.HelloAction; +import ch.qos.logback.core.joran.action.ext.TouchAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Wed Mar 5 14:02:32 2008 @@ -16,7 +16,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.action.IncAction; +import ch.qos.logback.core.joran.action.ext.IncAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.util.Constants; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Wed Mar 5 14:02:32 2008 @@ -16,6 +16,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.TrivialConfigurator; +import ch.qos.logback.core.joran.action.ext.IncAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadBeginAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/BadEndAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadEndAction.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/IncAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/SoccerPlayer.java Wed Mar 5 14:02:32 2008 @@ -0,0 +1,21 @@ +package ch.qos.logback.core.joran.action.ext; + +public class SoccerPlayer { + String name; + int age; + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public int getAge() { + return age; + } + public void setAge(int age) { + this.age = age; + } + + +} Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java (from r1631, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.action; +package ch.qos.logback.core.joran.action.ext; import org.xml.sax.Attributes; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/Fruit.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.ArrayList; import java.util.List; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/FruitContext.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContext.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.ArrayList; import java.util.List; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/FruitContextAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/FruitContextAction.java Wed Mar 5 14:02:32 2008 @@ -8,7 +8,7 @@ * Software Foundation. */ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import org.xml.sax.Attributes; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/PackageTest.java Wed Mar 5 14:02:32 2008 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import junit.framework.Test; import junit.framework.TestCase; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/ia/SimplePropertyIATest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/SimplePropertyIATest.java Wed Mar 5 14:02:32 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core.joran.ia; +package ch.qos.logback.core.joran.implicitAction; import java.util.HashMap; import java.util.List;

1 0

svn commit: r1631 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 21:34:51 2008 New Revision: 1631 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Log: - minor changes Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Tue Mar 4 21:34:51 2008 @@ -66,16 +66,15 @@ @Before public void setUp() throws Exception { - IncAction.beginCount = 0; - IncAction.errorCount = 0; - IncAction.endCount = 0; + IncAction.reset(); } @After public void tearDown() throws Exception { context = null; System.clearProperty(INCLUDE_KEY); - IncAction.reset(); + System.clearProperty(SECOND_FILE_KEY); + System.clearProperty(SUB_FILE_KEY); } @Test

1 0