August 2006 - logback-dev - mailman3.qos.ch

[Bug 2] New: Missing test case to verify status messages when LoggingContext is not configured
by bugzilla-daemon＠pixie.qos.ch 27 Oct '06

27 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=2 Summary: Missing test case to verify status messages when LoggingContext is not configured Product: logback-classic Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: blocker Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.ceki(a)qos.ch We need a test case to check that we do *not* flood the StatusManager when there are no appenders configured in the LoggingContext? -- 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 2

[Bug 3] New: Source jars
by bugzilla-daemon＠pixie.qos.ch 27 Oct '06

27 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=3 Summary: Source jars Product: logback-core Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: enhancement Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.ceki(a)qos.ch We should build source jars and include them in our distribution. This bug applies to all modules. -- 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 2

[Bug 4] New: Print view of short manual with Internet Explorer
by bugzilla-daemon＠pixie.qos.ch 27 Oct '06

27 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=4 Summary: Print view of short manual with Internet Explorer Product: logback-site Version: unspecified Platform: PC URL: http://logback.qos.ch/shortIntro.html OS/Version: Windows Status: NEW Severity: blocker Priority: P1 Component: other AssignedTo: logback-dev(a)qos.ch ReportedBy: ceki(a)qos.ch Altough the print preview of http://logback.qos.ch/shortIntro.html looks fine with Firefox, with IE it contains a large space between the author notice and the copyright notice. This is probably due to some invisible elment taking up space. -- 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 3

svn commit: r505 - 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 18:34:38 2006 New Revision: 505 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java Log: added an ExternalMockSocketServer and modified test case to allow tests to run with a server in a different jvm Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/ExternalMockSocketServer.java Thu Aug 31 18:34:38 2006 @@ -0,0 +1,72 @@ +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; + +public class ExternalMockSocketServer { + + 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; + + static int loopLen; + static int clientNumber; + + static List<String> msgList = new ArrayList<String>(); + static boolean finished = false; + + String className = LOGGINGEVENT; + + public static void main(String[] args) { + if (args.length == 2) { + clientNumber = Integer.parseInt(args[0]); + loopLen = Integer.parseInt((args[1])); + System.out.println("Starting Server..."); + runServer(); + } else { + usage("Wrong number of arguments."); + } + } + + static void usage(String msg) { + System.err.println(msg); + System.err.println("Usage: java " + + ExternalMockSocketServer.class.getName() + " clientNumber loopNumber"); + System.exit(1); + } + + static void runServer() { + ObjectInputStream ois; + Object readObject; + try { + System.out.println("Listening on port " + PORT); + ServerSocket serverSocket = new ServerSocket(PORT); + for (int j = 0; j < clientNumber; j++) { + Socket socket = serverSocket.accept(); + System.out.println("New client accepted."); + System.out.println("Connected to client at " + socket.getInetAddress()); + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); + for (int i = 0; i < loopLen; i++) { + readObject = ois.readObject(); + //msgList.add(readObject.toString()); + } + ois.close(); + System.out.println("Finished with this client."); + } + serverSocket.close(); + } catch (Exception se) { + se.printStackTrace(); + } + System.out.println("Server finished."); + 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 18:34:38 2006 @@ -22,28 +22,54 @@ * Run the test with a MockSocketServer or with a NOPOutputStream */ boolean runWithMockServer = true; + /** + * + * Run with external mock can be done using the + * ExternalMockSocketServer. It needs to be launched + * from a separate JVM. + * + * + * For example, with 4 test methods and a loopNumber of 10000, + * you can launch the ExternalMockSocketServer this way: + * + * + * <code>java ch.qos.logback.classic.net.ExternalMockSocketServer 4 20000</code> + * + * + * (20000 because each methods iterate twice). + * + */ + boolean runWithExternalMockServer = true; /** * Last results: * * 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. + * Minimal Object externalization: average time = 6511 after 10000 writes. + * Minimal Object serialization: average time = 7883 after 10000 writes. + * LoggingEvent object externalization: average time = 9641 after 10000 writes. + * LoggingEvent object serialization: average time = 25729 after 10000 writes. * - * MockServer: + * Internal 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. + * + * External MockServer: + * Minimal object externalization : average time = 55577 after 10000 writes. + * Minimal object serialization : average time = 56669 after 10000 writes. + * LoggingEvent object externalization : average time = 121477 after 10000 writes. + * LoggingEvent object serialization : average time = 111148 after 10000 writes. */ public void setUp() throws Exception { super.setUp(); if (runWithMockServer) { - mockServer = new MockSocketServer(loopNumber * 2); - mockServer.start(); + if (!runWithExternalMockServer) { + mockServer = new MockSocketServer(loopNumber * 2); + mockServer.start(); + } oos = new ObjectOutputStream(new Socket("localhost", MockSocketServer.PORT).getOutputStream()); } else { @@ -70,7 +96,7 @@ oos.reset(); } } catch (IOException ex) { - fail(); + fail(ex.getMessage()); } } @@ -89,7 +115,7 @@ oos.reset(); } } catch (IOException ex) { - fail(); + fail(ex.getMessage()); } } t2 = System.nanoTime(); @@ -97,7 +123,7 @@ System.out.println(label + " : average time = " + total / loopNumber + " after " + loopNumber + " writes."); - if (runWithMockServer) { + if (runWithMockServer && !runWithExternalMockServer) { mockServer.join(1000); assertTrue(mockServer.finished); }

1 0

svn commit: r504 - 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 15:25:27 2006 New Revision: 504 Added: 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/SMTPAppenderTestApp.java Log: tests are back Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Thu Aug 31 15:25:27 2006 @@ -0,0 +1,113 @@ +package ch.qos.logback.classic.net; + +import javax.mail.Address; +import javax.mail.MessagingException; + +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; + +public class SMTPAppenderTest extends TestCase { + + SMTPAppender appender; + + public void setUp() throws Exception { + super.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.nospam(a)qos.ch"); + appender.start(); + } + + public void tearDown() throws Exception { + super.tearDown(); + appender = null; + } + + public void testStart() { + try { + Address[] addressArray = appender.msg.getFrom(); + Address address = addressArray[0]; + assertEquals("user(a)host.dom", address.toString()); + + 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()); + } + + + public void testDefaultEvaluatorNoTrigger() { + DefaultEvaluator evaluator = new DefaultEvaluator(); + LoggingEvent le = new LoggingEvent(); + le.setLevel(Level.DEBUG); + assertFalse(evaluator.isTriggeringEvent(null,le)); + } + + public void testDefaultEvaluatorTrigger() { + DefaultEvaluator evaluator = new DefaultEvaluator(); + LoggingEvent le = new LoggingEvent(); + le.setLevel(Level.ERROR); + assertTrue(evaluator.isTriggeringEvent(null,le)); + } + + 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; + } +} 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 Thu Aug 31 15:25:27 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: r503 - 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 15:24:59 2006 New Revision: 503 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: tmp delete

1 0

svn commit: r502 - 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 15:02:06 2006 New Revision: 502 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Log: - corrected writeObject method 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 15:02:06 2006 @@ -253,7 +253,7 @@ private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); out.writeObject(logger.getName()); - out.writeObject(level.levelInt); + out.writeInt(level.levelInt); } private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {

1 0

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