Author: seb Date: Wed Jan 24 21:20:22 2007 New Revision: 1281 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java logback/trunk/pom.xml Log: Logback now references SLF4J 1.2 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 Wed Jan 24 21:20:22 2007 @@ -12,6 +12,10 @@ import java.util.Map; import junit.framework.TestCase; + +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; @@ -100,24 +104,24 @@ assertEquals("testValue", MDCPropertyMap.get("key")); } -// public void testMessageWithMarker() throws InterruptedException { -// startServer(1); -// configureClient(); -// -// Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); -// -// Marker marker = MarkerFactory.getMarker("testMarker"); -// logger.debug(marker, "test msg"); -// -// // Wait max 2 seconds for mock server to finish. However, it should -// // finish much sooner than that. -// mockSocketServer.join(2000); -// assertTrue(mockSocketServer.isFinished()); -// assertEquals(1, mockSocketServer.getEventsList().size()); -// -// LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); -// assertEquals("testMarker", remoteEvent.getMarker().getName()); -// } + public void testMessageWithMarker() throws InterruptedException { + startServer(1); + configureClient(); + + Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); + + Marker marker = MarkerFactory.getMarker("testMarker"); + logger.debug(marker, "test msg"); + + // Wait max 2 seconds for mock server to finish. However, it should + // finish much sooner than that. + mockSocketServer.join(2000); + assertTrue(mockSocketServer.isFinished()); + assertEquals(1, mockSocketServer.getEventsList().size()); + + LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); + assertEquals("testMarker", remoteEvent.getMarker().getName()); + } public void testMessageWithUpdatedMDC() throws InterruptedException { startServer(2); Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Wed Jan 24 21:20:22 2007 @@ -38,7 +38,7 @@ <properties> <!-- slf4j.version property is used by setClasspath.cmd --> - <slf4j.version>1.1.0</slf4j.version> + <slf4j.version>1.2</slf4j.version> <retrotranslator.verify>false</retrotranslator.verify> </properties>