- logback-dev - mailman3.qos.ch

svn commit: r501 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net: . testObjectBuilders
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 15:01:05 2006 New Revision: 501 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java 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/testObjectBuilders/MinimalExtBuilder.java Log: - Modified perf test to use a MockSocketServer and actually consume events - Modified MockSocketServer so that we can use it to check multiple object, not only LoggingEvent objects Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java Thu Aug 31 15:01:05 2006 @@ -16,8 +16,6 @@ import java.util.ArrayList; import java.util.List; -import ch.qos.logback.classic.spi.LoggingEvent; - /** * * @@ -25,6 +23,11 @@ */ public class MockSocketServer extends Thread { + static final String LOGGINGEVENT = "LoggingEvent"; + static final String LOGGINGEVENT2 = "LoggingEvent2"; + static final String MINIMALEXT = "MinimalExt"; + static final String MINIMALSER = "MinimalSer"; + static final int PORT = 4560; final int loopLen; @@ -32,6 +35,8 @@ List<String> msgList = new ArrayList<String>(); boolean finished = false; + String className = LOGGINGEVENT; + MockSocketServer(int loopLen) { super(); this.loopLen = loopLen; @@ -39,24 +44,25 @@ @Override public void run() { + ObjectInputStream ois; + Object readObject; try { - System.out.println("Listening on port " + PORT); + //System.out.println("Listening on port " + PORT); ServerSocket serverSocket = new ServerSocket(PORT); - ObjectInputStream ois; - LoggingEvent event; + //System.out.println("Waiting to accept a new client."); + Socket socket = serverSocket.accept(); + //System.out.println("Connected to client at " + socket.getInetAddress()); + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); for (int i = 0; i < loopLen; i++) { - System.out.println("Waiting to accept a new client."); - Socket socket = serverSocket.accept(); - System.out.println("Connected to client at " + socket.getInetAddress()); - ois = new ObjectInputStream(new BufferedInputStream(socket - .getInputStream())); - event = (LoggingEvent) ois.readObject(); - msgList.add(event.getMessage()); + readObject = ois.readObject(); + msgList.add(readObject.toString()); } + ois.close(); + serverSocket.close(); } catch (Exception se) { se.printStackTrace(); } finished = true; } - } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Thu Aug 31 15:01:05 2006 @@ -2,50 +2,75 @@ import java.io.IOException; import java.io.ObjectOutputStream; +import java.net.Socket; +import junit.framework.TestCase; import ch.qos.logback.classic.net.testObjectBuilders.Builder; import ch.qos.logback.classic.net.testObjectBuilders.LoggingEvent2Builder; import ch.qos.logback.classic.net.testObjectBuilders.LoggingEventBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalExtBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalSerBuilder; -import junit.framework.TestCase; - public class SerializationPerfsTest extends TestCase { ObjectOutputStream oos; + MockSocketServer mockServer; - int loopNumber = 5000; + int loopNumber = 10000; int resetFrequency = 100; - + /** + * Run the test with a MockSocketServer or with a NOPOutputStream + */ + boolean runWithMockServer = true; + /** * Last results: * - * Minimal Object Externalization: average time = 6511 after 10000 writes. - * Minimal Object Serialization: average time = 7883 after 10000 writes. - * Externalization: average time = 9641 after 10000 writes. Serialization: - * average time = 25729 after 10000 writes. + * NOPOutputStream: + * Minimal Object Externalization: average time = 6511 after 10000 writes. + * Minimal Object Serialization: average time = 7883 after 10000 writes. + * Externalization: average time = 9641 after 10000 writes. + * Serialization: average time = 25729 after 10000 writes. + * + * MockServer: + * Minimal object externalization : average time = 62040 after 10000 writes. + * Minimal object serialization : average time = 76237 after 10000 writes. + * LoggingEvent object externalization : average time = 122714 after 10000 writes. + * LoggingEvent object serialization : average time = 121711 after 10000 writes. */ public void setUp() throws Exception { super.setUp(); - oos = new ObjectOutputStream(new NOPOutputStream()); + if (runWithMockServer) { + mockServer = new MockSocketServer(loopNumber * 2); + mockServer.start(); + oos = new ObjectOutputStream(new Socket("localhost", + MockSocketServer.PORT).getOutputStream()); + } else { + oos = new ObjectOutputStream(new NOPOutputStream()); + } } public void tearDown() throws Exception { super.tearDown(); + oos.close(); oos = null; + mockServer = null; } - public void testPerf(Builder builder, String label) throws IOException { - + public void runPerfTest(Builder builder, String label) throws Exception { + // first run for just in time compiler int counter = 0; for (int i = 0; i < loopNumber; i++) { - oos.writeObject(builder.build(i)); - oos.flush(); - if (++counter >= resetFrequency) { - oos.reset(); + try { + oos.writeObject(builder.build(i)); + oos.flush(); + if (++counter >= resetFrequency) { + oos.reset(); + } + } catch (IOException ex) { + fail(); } } @@ -54,37 +79,47 @@ Long t2; Long total = 0L; counter = 0; + // System.out.println("Beginning mesured run"); t1 = System.nanoTime(); for (int i = 0; i < loopNumber; i++) { - oos.writeObject(builder.build(i)); - oos.flush(); - if (++counter >= resetFrequency) { - oos.reset(); + try { + oos.writeObject(builder.build(i)); + oos.flush(); + if (++counter >= resetFrequency) { + oos.reset(); + } + } catch (IOException ex) { + fail(); } } t2 = System.nanoTime(); total += (t2 - t1); - System.out.println(label+" : average time = " - + total / loopNumber + " after " + loopNumber + " writes."); + System.out.println(label + " : average time = " + total / loopNumber + + " after " + loopNumber + " writes."); + + if (runWithMockServer) { + mockServer.join(1000); + assertTrue(mockServer.finished); + } } - public void testWithMinimalExternalization() throws IOException { + public void testWithMinimalExternalization() throws Exception { Builder builder = new MinimalExtBuilder(); - testPerf(builder, "Minimal object externalization"); + runPerfTest(builder, "Minimal object externalization"); } - public void testWithMinimalSerialization() throws IOException { + public void testWithMinimalSerialization() throws Exception { Builder builder = new MinimalSerBuilder(); - testPerf(builder, "Minimal object serialization"); + runPerfTest(builder, "Minimal object serialization"); } - public void testWithExternalization() throws IOException { + public void testWithExternalization() throws Exception { Builder builder = new LoggingEventBuilder(); - testPerf(builder, "LoggingEvent object externalization"); + runPerfTest(builder, "LoggingEvent object externalization"); } - public void testWithSerialization() throws IOException { + public void testWithSerialization() throws Exception { Builder builder = new LoggingEvent2Builder(); - testPerf(builder, "LoggingEvent object serialization"); + runPerfTest(builder, "LoggingEvent object serialization"); } } 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 Thu Aug 31 15:01:05 2006 @@ -38,7 +38,7 @@ // finish much sooner than that. mockServer.join(2000); assertTrue(mockServer.finished); - assertEquals("test", mockServer.msgList.get(0)); + assertTrue(mockServer.msgList.get(0).startsWith("ch.qos.logback.classic.spi.LoggingEvent@")); } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java Thu Aug 31 15:01:05 2006 @@ -20,6 +20,10 @@ String message; + //public no-args constructor is needed for Externalization + public MinimalExt() { + } + public MinimalExt(int i) { // 45 characters message message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i;

1 0

svn commit: r500 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 09:42:49 2006 New Revision: 500 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - improved mock server behaviour Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/MockSocketServer.java Thu Aug 31 09:42:49 2006 @@ -9,11 +9,15 @@ */ package ch.qos.logback.classic.net; +import java.io.BufferedInputStream; +import java.io.ObjectInputStream; import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; import java.util.List; +import ch.qos.logback.classic.spi.LoggingEvent; + /** * * @@ -38,12 +42,16 @@ try { System.out.println("Listening on port " + PORT); ServerSocket serverSocket = new ServerSocket(PORT); - + ObjectInputStream ois; + LoggingEvent event; for (int i = 0; i < loopLen; i++) { System.out.println("Waiting to accept a new client."); Socket socket = serverSocket.accept(); System.out.println("Connected to client at " + socket.getInetAddress()); - msgList.add(socket.toString()); + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); + event = (LoggingEvent) ois.readObject(); + msgList.add(event.getMessage()); } } catch (Exception se) { se.printStackTrace(); 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 Thu Aug 31 09:42:49 2006 @@ -18,7 +18,7 @@ public void testRecieveMessage() throws InterruptedException { MockSocketServer mockServer = new MockSocketServer(1); mockServer.start(); - mockServer.join(1000); + //mockServer.join(1000); // client configuration LoggerContext lc = new LoggerContext(); @@ -38,6 +38,7 @@ // finish much sooner than that. mockServer.join(2000); assertTrue(mockServer.finished); - assertNotNull(mockServer.msgList.get(0)); + assertEquals("test", mockServer.msgList.get(0)); + } }

1 0

svn commit: r499 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net: . testObjectBuilders
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 09:40:02 2006 New Revision: 499 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/NOPOutputStream.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: - Improved code readability in the perfs test - Added an NOPOutputstream Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/NOPOutputStream.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/NOPOutputStream.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,14 @@ +package ch.qos.logback.classic.net; + +import java.io.IOException; +import java.io.OutputStream; + +public class NOPOutputStream extends OutputStream { + + @Override + public void write(int b) throws IOException { + // do nothing + + } + +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Thu Aug 31 09:40:02 2006 @@ -1,209 +1,90 @@ package ch.qos.logback.classic.net; -import java.io.ByteArrayOutputStream; -import java.io.Externalizable; import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.io.ObjectOutputStream; -import java.io.Serializable; + +import ch.qos.logback.classic.net.testObjectBuilders.Builder; +import ch.qos.logback.classic.net.testObjectBuilders.LoggingEvent2Builder; +import ch.qos.logback.classic.net.testObjectBuilders.LoggingEventBuilder; +import ch.qos.logback.classic.net.testObjectBuilders.MinimalExtBuilder; +import ch.qos.logback.classic.net.testObjectBuilders.MinimalSerBuilder; import junit.framework.TestCase; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.classic.spi.LoggingEvent2; public class SerializationPerfsTest extends TestCase { - LoggerContext lc; - - int loopNumber = 10000; + ObjectOutputStream oos; + int loopNumber = 5000; + int resetFrequency = 100; + /** * Last results: * - * Minimal Object Externalization: median time = 9981 after 10000 writes. - * Minimal Object Serialization: median time = 13127 after 10000 writes. - * Externalization: median time = 14008 after 10000 writes. - * Serialization: median time = 31320 after 10000 writes.. + * Minimal Object Externalization: average time = 6511 after 10000 writes. + * Minimal Object Serialization: average time = 7883 after 10000 writes. + * Externalization: average time = 9641 after 10000 writes. Serialization: + * average time = 25729 after 10000 writes. */ public void setUp() throws Exception { super.setUp(); - lc = new LoggerContext(); + oos = new ObjectOutputStream(new NOPOutputStream()); } public void tearDown() throws Exception { super.tearDown(); - lc = null; - } - - public void testWithMinimalExternalization() throws IOException { - ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream()); - - // first run for just in time compiler - for (int i = 0; i < loopNumber; i++) { - oos.writeObject(buildEvent(i)); - } - - // second run - Long t1; - Long t2; - Long total = 0L; - int resetFrequency = 20; - int counter = 0; - for (int i = 0; i < loopNumber; i++) { - t1 = System.nanoTime(); - oos.writeObject(new MinimalExt(i)); - t2 = System.nanoTime(); - total += (t2 - t1); - oos.flush(); - if (++counter >= resetFrequency) { - oos.reset(); - } - } - System.out.println("Minimal Object Externalization: median time = " + total - / loopNumber + " after " + loopNumber + " writes."); - } - - public void testWithMinimalSerialization() throws IOException { - ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream()); - - // first run for just in time compiler - for (int i = 0; i < loopNumber; i++) { - oos.writeObject(buildEvent(i)); - } - - // second run - Long t1; - Long t2; - Long total = 0L; - int resetFrequency = 20; - int counter = 0; - for (int i = 0; i < loopNumber; i++) { - t1 = System.nanoTime(); - oos.writeObject(new MinimalSer(i)); - t2 = System.nanoTime(); - total += (t2 - t1); - oos.flush(); - if (++counter >= resetFrequency) { - oos.reset(); - } - } - System.out.println("Minimal Object Serialization: median time = " + total - / loopNumber + " after " + loopNumber + " writes."); + oos = null; } - public void testWithExternalization() throws IOException { - - ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream()); - + public void testPerf(Builder builder, String label) throws IOException { + // first run for just in time compiler - for (int i = 0; i < loopNumber; i++) { - oos.writeObject(buildEvent(i)); - } - - // second run - Long t1; - Long t2; - Long total = 0L; - int resetFrequency = 20; int counter = 0; for (int i = 0; i < loopNumber; i++) { - t1 = System.nanoTime(); - oos.writeObject(buildEvent(i)); - t2 = System.nanoTime(); - total += (t2 - t1); + oos.writeObject(builder.build(i)); oos.flush(); if (++counter >= resetFrequency) { oos.reset(); } } - System.out.println("Externalization: median time = " + total / loopNumber - + " after " + loopNumber + " writes."); - } - - public void testWithSerialization() throws IOException { - - ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream()); - - // first run for just in time compiler - for (int i = 0; i < loopNumber; i++) { - oos.writeObject(buildEvent2(i)); - } // second run Long t1; Long t2; Long total = 0L; - int resetFrequency = 20; - int counter = 0; + counter = 0; + t1 = System.nanoTime(); for (int i = 0; i < loopNumber; i++) { - t1 = System.nanoTime(); - oos.writeObject(buildEvent2(i)); - t2 = System.nanoTime(); - total += (t2 - t1); + oos.writeObject(builder.build(i)); oos.flush(); if (++counter >= resetFrequency) { oos.reset(); } } - System.out.println("Serialization: median time = " + total / loopNumber - + " after " + loopNumber + " writes."); - } - - private LoggingEvent buildEvent(int i) { - LoggingEvent le = new LoggingEvent(); - le.setLevel(Level.DEBUG); - le.setLogger(lc.getLogger(LoggerContext.ROOT_NAME)); - // 45 characters message - le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); - le.setThreadName("threadName"); - return le; - } - - private LoggingEvent2 buildEvent2(int i) { - LoggingEvent2 le = new LoggingEvent2(); - le.setLevel(Level.DEBUG); - le.setLogger(lc.getLogger(LoggerContext.ROOT_NAME)); - // 45 characters message - le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); - le.setThreadName("threadName"); - return le; + t2 = System.nanoTime(); + total += (t2 - t1); + System.out.println(label+" : average time = " + + total / loopNumber + " after " + loopNumber + " writes."); } -} - -class MinimalExt implements Externalizable { - - private static final long serialVersionUID = -1367146218373963709L; - - String message; - public MinimalExt(int i) { - // 45 characters message - message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + public void testWithMinimalExternalization() throws IOException { + Builder builder = new MinimalExtBuilder(); + testPerf(builder, "Minimal object externalization"); } - public void readExternal(ObjectInput in) throws IOException, - ClassNotFoundException { - message = (String) in.readObject(); - + public void testWithMinimalSerialization() throws IOException { + Builder builder = new MinimalSerBuilder(); + testPerf(builder, "Minimal object serialization"); } - public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(message); + public void testWithExternalization() throws IOException { + Builder builder = new LoggingEventBuilder(); + testPerf(builder, "LoggingEvent object externalization"); } -} -class MinimalSer implements Serializable { - - private static final long serialVersionUID = 2807646397580899815L; - - String message; - - public MinimalSer(int i) { - // 45 characters message - message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + public void testWithSerialization() throws IOException { + Builder builder = new LoggingEvent2Builder(); + testPerf(builder, "LoggingEvent object serialization"); } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/Builder.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,6 @@ +package ch.qos.logback.classic.net.testObjectBuilders; + +public interface Builder { + + Object build(int i); +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEvent2Builder.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,18 @@ +package ch.qos.logback.classic.net.testObjectBuilders; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggingEvent2; + +public class LoggingEvent2Builder implements Builder { + + public Object build(int i) { + LoggingEvent2 le = new LoggingEvent2(); + le.setLevel(Level.DEBUG); + le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); + // 45 characters message + le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); + le.setThreadName("threadName"); + return le; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/LoggingEventBuilder.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,18 @@ +package ch.qos.logback.classic.net.testObjectBuilders; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggingEvent; + +public class LoggingEventBuilder implements Builder { + + public Object build(int i) { + LoggingEvent le = new LoggingEvent(); + le.setLevel(Level.DEBUG); + le.setLogger(new LoggerContext().getLogger(LoggerContext.ROOT_NAME)); + // 45 characters message + le.setMessage("aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i); + le.setThreadName("threadName"); + return le; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalExtBuilder.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,37 @@ +package ch.qos.logback.classic.net.testObjectBuilders; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + + +public class MinimalExtBuilder implements Builder { + + public Object build(int i) { + return new MinimalExt(i); + } + +} + +class MinimalExt implements Externalizable { + + private static final long serialVersionUID = -1367146218373963709L; + + String message; + + public MinimalExt(int i) { + // 45 characters message + message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + } + + public void readExternal(ObjectInput in) throws IOException, + ClassNotFoundException { + message = (String) in.readObject(); + + } + + public void writeExternal(ObjectOutput out) throws IOException { + out.writeObject(message); + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/testObjectBuilders/MinimalSerBuilder.java Thu Aug 31 09:40:02 2006 @@ -0,0 +1,24 @@ +package ch.qos.logback.classic.net.testObjectBuilders; + +import java.io.Serializable; + + +public class MinimalSerBuilder implements Builder{ + + public Object build(int i) { + return new MinimalSer(i); + } + +} + +class MinimalSer implements Serializable { + + private static final long serialVersionUID = 2807646397580899815L; + + String message; + + public MinimalSer(int i) { + // 45 characters message + message = "aaaaabbbbbcccccdddddaaaaabbbbbcccccdddddaaaa" + i; + } +} \ No newline at end of file

1 0

svn commit: r498 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 09:38:24 2006 New Revision: 498 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Log: two attributes made transient Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Thu Aug 31 09:38:24 2006 @@ -78,9 +78,9 @@ private transient Logger logger; - private ThrowableInformation throwableInfo; + transient private ThrowableInformation throwableInfo; - private CallerData[] callerDataArray; + transient private CallerData[] callerDataArray; private Marker marker;

1 0

svn commit: r497 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic main/java/ch/qos/logback/classic/pattern main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic test/java/ch/qos/logback/classic/boolex test/java/ch/qos/logback/classic/joran test/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 18:48:35 2006 New Revision: 497 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Log: - Added - Added an Object[] argArray parameter to the LoggingEvent constructor. - Updated client classes accordingly. - Removed formattedMessage != null check in MessageConverter. - Removed message formatting calls from Logger. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Wed Aug 30 18:48:35 2006 @@ -358,34 +358,33 @@ return childLogger; } + /** + * The next three methods could be merged. + * However, we decided not to merge them to make the calls to + * these methods more easily understandable, avoiding many instances + * of passing null parameters. + */ private void filterAndLog(String caller, Level level, String format, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, null); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - le.setFormattedMessage(format); callAppenders(le); } } private void filterAndLog(String caller, Level level, String format, Object[] argArray, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); - le.setArgumentArray(argArray); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, argArray); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - String formattedMessage = MessageFormatter.arrayFormat(format, argArray); - le.setFormattedMessage(formattedMessage); callAppenders(le); } } private void filterAndLog(String caller, Level level, Marker marker, String format, Object[] argArray, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, argArray); le.setMarker(marker); - le.setArgumentArray(argArray); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - String formattedMessage = MessageFormatter.arrayFormat(format, argArray); - le.setFormattedMessage(formattedMessage); callAppenders(le); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Wed Aug 30 18:48:35 2006 @@ -20,9 +20,6 @@ public String convert(Object event) { LoggingEvent le = (LoggingEvent) event; - if (le.getFormattedMessage() == null) { - return le.getMessage(); - } return le.getFormattedMessage(); } 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 Wed Aug 30 18:48:35 2006 @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.Marker; +import org.slf4j.impl.MessageFormatter; import ch.qos.logback.classic.Level; @@ -97,7 +98,7 @@ } public LoggingEvent(String fqcn, Logger logger, Level level, String message, - Throwable throwable) { + Throwable throwable, Object[] argArray) { this.fqnOfLoggerClass = fqcn; this.logger = logger; this.level = level; @@ -106,14 +107,13 @@ if (throwable != null) { this.throwableInfo = new ThrowableInformation(throwable); } - timeStamp = System.currentTimeMillis(); - } - - public void setArgumentArray(Object[] argArray) { - if (this.argumentArray != null) { - throw new IllegalStateException("argArray has been already set"); + + if (argArray != null) { + formattedMessage = MessageFormatter.arrayFormat(message, argArray); + } else { + formattedMessage = message; } - this.argumentArray = argArray; + timeStamp = System.currentTimeMillis(); } public Object[] getArgumentArray() { @@ -257,14 +257,6 @@ return formattedMessage; } - public void setFormattedMessage(String formattedMessage) { - if (this.formattedMessage != null) { - throw new IllegalStateException( - "The formatted message has been already set for this event."); - } - this.formattedMessage = formattedMessage; - } - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { threadName = (String) in.readObject(); 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 Wed Aug 30 18:48:35 2006 @@ -45,7 +45,7 @@ LoggingEvent makeLoggingEvent(Exception ex) { return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); } public Object getEventObject() { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java Wed Aug 30 18:48:35 2006 @@ -32,7 +32,7 @@ LoggingEvent makeLoggingEvent(Exception ex) { LoggingEvent e = new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); return e; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java Wed Aug 30 18:48:35 2006 @@ -44,7 +44,7 @@ assertNotNull(evaluator); Logger logger = loggerContext.getLogger("xx"); - LoggingEvent event = new LoggingEvent("foo", logger, Level.DEBUG, "Hello world",null); + LoggingEvent event = new LoggingEvent("foo", logger, Level.DEBUG, "Hello world", null, null); StatusPrinter.print(loggerContext.getStatusManager()); assertTrue(evaluator.evaluate(event)); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Wed Aug 30 18:48:35 2006 @@ -50,7 +50,7 @@ // particular test. LoggingEvent makeLoggingEvent(Exception ex) { return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); } Exception getException(String msg, Exception cause) {

1 0

svn commit: r496 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:43:17 2006 New Revision: 496 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Log: MessageConverter needs to check what message it needs to return. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Wed Aug 30 16:43:17 2006 @@ -20,6 +20,9 @@ public String convert(Object event) { LoggingEvent le = (LoggingEvent) event; + if (le.getFormattedMessage() == null) { + return le.getMessage(); + } return le.getFormattedMessage(); }

1 0

svn commit: r495 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . net
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:42:25 2006 New Revision: 495 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Log: updated PackageTest and AllTest to include all tests Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Wed Aug 30 16:42:25 2006 @@ -18,11 +18,12 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.joran.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.net.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); + return suite; } } 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 Wed Aug 30 16:42:25 2006 @@ -1,11 +1,11 @@ -/** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2005, QOS.ch, LOGBack.com - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic; @@ -19,6 +19,7 @@ suite.addTestSuite(DynamicLoggerContextTest.class); suite.addTestSuite(PatternLayoutTest.class); suite.addTestSuite(BasicLoggerTest.class); + suite.addTestSuite(MessageFormattingTest.class); return suite; } } \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Wed Aug 30 16:42:25 2006 @@ -1,11 +1,11 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * + * Logback: the reliable, generic, fast and flexible logging framework. + * * Copyright (C) 1999-2006, QOS.ch - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic.net; @@ -19,6 +19,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(SyslogAppenderTest.class); + suite.addTestSuite(SMTPAppenderTest.class); + suite.addTestSuite(SocketAppenderTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r494 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:18:41 2006 New Revision: 494 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java Log: updated Package Test Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java Wed Aug 30 16:18:41 2006 @@ -1,11 +1,11 @@ -/** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2005, QOS.ch, LOGBack.com - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic.control; @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(RandomUtilTest.class); + suite.addTestSuite(ScenarioMakerTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r490 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 29 Aug '06

29 Aug '06

Author: seb Date: Tue Aug 29 16:46:48 2006 New Revision: 490 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: on going work: testing SMTPAppender Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Tue Aug 29 16:46:48 2006 @@ -1,40 +1,89 @@ package ch.qos.logback.classic.net; -import org.slf4j.LoggerFactory; +import javax.mail.Address; +import javax.mail.MessagingException; -import ch.qos.logback.classic.Logger; +import junit.framework.TestCase; +import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Layout; -import ch.qos.logback.core.util.StatusPrinter; -public class SMTPAppenderTest { +public class SMTPAppenderTest extends TestCase { - public static void main(String[] args) { + SMTPAppender appender; - Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - SMTPAppender appender = new SMTPAppender(); + public void setUp() { + LoggerContext lc = new LoggerContext(); + appender = new SMTPAppender(); appender.setContext(lc); appender.setName("smtp"); appender.setFrom("user(a)host.dom"); appender.setLayout(buildLayout(lc)); appender.setSMTPHost("mail.qos.ch"); appender.setSubject("logging report"); - appender.setTo("sebastien(a)qos.ch"); - + appender.setTo("sebastien.nospam(a)qos.ch"); appender.start(); - - logger.addAppender(appender); - - for (int i = 0; i <= 10; i++) { - logger.debug("** Hello world. n=" + i); - } - logger.error("Triggering request"); + } + + public void testStart() { + try { + Address[] addressArray = appender.msg.getFrom(); + Address address = addressArray[0]; + assertEquals("user(a)host.dom", address.toString()); - StatusPrinter.print(lc.getStatusManager()); + addressArray = null; + address = null; + + addressArray = appender.msg.getAllRecipients(); + address = addressArray[0]; + assertEquals("sebastien.nospam(a)qos.ch", address.toString()); + + assertEquals("logging report", appender.msg.getSubject()); + + assertTrue(appender.isStarted()); + + } catch (MessagingException ex) { + fail("Unexpected exception."); + } + } + + public void testAppendNonTriggeringEvent() { + LoggingEvent event = new LoggingEvent(); + event.setThreadName("thead name"); + event.setLevel(Level.DEBUG); + appender.append(event); + assertEquals(1, appender.cb.length()); + } + + public void testEntryConditionsCheck() { + appender.checkEntryConditions(); + assertEquals(0, appender.getContext().getStatusManager().getCount()); } + public void testEntryConditionsCheckNoMessage() { + appender.msg = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoEvaluator() { + appender.evaluator = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoLayout() { + appender.setLayout(null); + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + //TODO test defaultEvaluator == test triggering event + public void tearDown() { + appender = null; + } private static Layout buildLayout(LoggerContext lc) { PatternLayout layout = new PatternLayout(); layout.setContext(lc); @@ -44,5 +93,4 @@ layout.start(); return layout; } - } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Tue Aug 29 16:46:48 2006 @@ -0,0 +1,48 @@ +package ch.qos.logback.classic.net; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.util.StatusPrinter; + +public class SMTPAppenderTestApp { + + public static void main(String[] args) { + + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SMTPAppender appender = new SMTPAppender(); + appender.setContext(lc); + appender.setName("smtp"); + appender.setFrom("user(a)host.dom"); + appender.setLayout(buildLayout(lc)); + appender.setSMTPHost("mail.qos.ch"); + appender.setSubject("logging report"); + appender.setTo("sebastien.nospam(a)qos.ch"); + + appender.start(); + + logger.addAppender(appender); + + for (int i = 0; i <= 10; i++) { + logger.debug("** Hello world. n=" + i); + } + logger.error("Triggering request"); + + StatusPrinter.print(lc.getStatusManager()); + } + + private static Layout buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFooter("Some footer"); + layout.start(); + return layout; + } + +}

1 0

svn commit: r487 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 29 Aug '06

29 Aug '06

Author: seb Date: Tue Aug 29 15:00:36 2006 New Revision: 487 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: on going work on SocketAppender Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Tue Aug 29 15:00:36 2006 @@ -0,0 +1,52 @@ +package ch.qos.logback.classic.net; + +import junit.framework.TestCase; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.appender.ListAppender; + +public class SocketAppenderTest extends TestCase{ + + LoggerContext lc; + ListAppender remoteListAppender; + + public void testStartFailNoRemoteHost() { + LoggerContext lc = new LoggerContext(); + SocketAppender appender = new SocketAppender(); + appender.setContext(lc); + appender.setPort(123); + appender.start(); + assertEquals(1, lc.getStatusManager().getCount()); + } + + public void testRecieveMessage() { + Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); + logger.debug("test"); + assertEquals(1, remoteListAppender.list.size()); + } + + public void setUp() { + //client configuration + lc = new LoggerContext(); + Logger root = lc.getLogger(LoggerContext.ROOT_NAME); + SocketAppender socket = new SocketAppender(); + socket.setContext(lc); + socket.setName("socket"); + socket.setPort(4560); + socket.setRemoteHost("localhost"); + root.addAppender(socket); + + //server configuration + LoggerContext remoteLc = ((Logger)SimpleSocketServer.logger).getLoggerContext(); + Logger remoteRoot = remoteLc.getLogger(LoggerContext.ROOT_NAME); + remoteListAppender = new ListAppender(); + remoteListAppender.setContext(remoteLc); + remoteListAppender.setName("list"); + remoteRoot.addAppender(remoteListAppender); + SimpleSocketServer.runServer(); + } + + public void tearDown() { + lc = null; + } +}

1 0