[LOGBack-dev] svn commit: r568 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern

noreply.seb at qos.ch noreply.seb at qos.ch
Tue Sep 12 18:08:02 CEST 2006


Author: seb
Date: Tue Sep 12 18:08:02 2006
New Revision: 568

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/MDCConverterTest.java
   logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/PackageTest.java

Log:
corrected a MDC related misuse, causing tests to fail although everyting was fine

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	Tue Sep 12 18:08:02 2006
@@ -28,282 +28,283 @@
 
 public class ConverterTest extends TestCase {
 
-	LoggerContext lc = new LoggerContext();
-	Logger logger = lc.getLogger(ConverterTest.class);
-	LoggingEvent le;
-	List<String> optionList = new ArrayList<String>();
-
-	public ConverterTest(String arg0) {
-		super(arg0);
-
-		Exception rootEx = getException("Innermost", null);
-		Exception nestedEx = getException("Nested", rootEx);
-
-		Exception ex = new Exception("Bogus exception", nestedEx);
-
-		le = makeLoggingEvent(ex);
-		// ex.printStackTrace();
-	}
-
-	// The LoggingEvent is massaged with an FCQN of FormattingConverter. This
-	// forces the
-	// returned caller information to match the caller stack for this this
-	// particular test.
-	LoggingEvent makeLoggingEvent(Exception ex) {
-		return new LoggingEvent(
-				ch.qos.logback.core.pattern.FormattingConverter.class.getName(),
-				logger, Level.INFO, "Some message", ex, null);
-	}
-
-	Exception getException(String msg, Exception cause) {
-		return new Exception(msg, cause);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testLineOfCaller() {
-		{
-			DynamicConverter converter = new LineOfCallerConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			// the number below should be the line number of the previous line
-			assertEquals("74", buf.toString());
-		}
-	}
-
-	public void testLevel() {
-		{
-			DynamicConverter converter = new LevelConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals("INFO", buf.toString());
-		}
-		{
-			DynamicConverter converter = new LevelConverter();
-			converter.setFormattingInfo(new FormatInfo(1, 1, true, false));
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals("I", buf.toString());
-		}
-	}
-
-	public void testThread() {
-		DynamicConverter converter = new ThreadConverter();
-		StringBuffer buf = new StringBuffer();
-		converter.write(buf, le);
-		assertEquals("main", buf.toString());
-	}
-
-	public void testMessage() {
-		DynamicConverter converter = new MessageConverter();
-		StringBuffer buf = new StringBuffer();
-		converter.write(buf, le);
-		assertEquals("Some message", buf.toString());
-	}
-
-	public void testLineSeparator() {
-		DynamicConverter converter = new LineSeparatorConverter();
-		StringBuffer buf = new StringBuffer();
-		converter.write(buf, le);
-		assertEquals(CoreGlobal.LINE_SEPARATOR, buf.toString());
-	}
-
-	public void testException() {
-		{
-			DynamicConverter converter = new ThrowableInformationConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			System.out.println(buf);
-		}
-
-		{
-			DynamicConverter converter = new ThrowableInformationConverter();
-			this.optionList.add("3");
-			converter.setOptionList(this.optionList);
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			System.out.println(buf);
-		}
-	}
-
-	public void testLogger() {
-		{
-			DynamicConverter converter = new LoggerConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals(this.getClass().getName(), buf.toString());
-		}
-
-		{
-			DynamicConverter converter = new LoggerConverter();
-			this.optionList.add("20");
-			converter.setOptionList(this.optionList);
-			converter.start();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals("c.q.l.c.p.ConverterTest", buf.toString());
-		}
-	}
-
-	public void testClass() {
-		{
-			DynamicConverter converter = new ClassOfCallerConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals(this.getClass().getName(), buf.toString());
-		}
-	}
-
-	public void testMethodOfCaller() {
-		{
-			DynamicConverter converter = new MethodOfCallerConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals("testMethodOfCaller", buf.toString());
-		}
-	}
-
-	public void testFileOfCaller() {
-		{
-			DynamicConverter converter = new FileOfCallerConverter();
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			assertEquals("ConverterTest.java", buf.toString());
-		}
-	}
-
-	public void testCallerData() {
-		{
-			DynamicConverter converter = new CallerDataConverter();
-			converter.start();
-
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			if (buf.length() < 10) {
-				fail("buf is too short");
-			}
-		}
-
-		{
-			DynamicConverter converter = new CallerDataConverter();
-			this.optionList.add("2");
-			this.optionList.add("XXX");
-			converter.setOptionList(this.optionList);
-			converter.start();
-
-			StringBuffer buf = new StringBuffer();
-			LoggingEvent event = makeLoggingEvent(null);
-			event.setMarker(MarkerFactory.getMarker("XXX"));
-			converter.write(buf, event);
-			if (buf.length() < 10) {
-				fail("buf is too short");
-			}
-		}
-
-		{
-			DynamicConverter converter = new CallerDataConverter();
-			this.optionList.clear();
-			this.optionList.add("2");
-			this.optionList.add("XXX");
-			this.optionList.add("*");
-			converter.setOptionList(this.optionList);
-			converter.start();
-
-			StringBuffer buf = new StringBuffer();
-			LoggingEvent event = makeLoggingEvent(null);
-			event.setMarker(MarkerFactory.getMarker("YYY"));
-			converter.write(buf, event);
-			if (buf.length() < 10) {
-				fail("buf is too short");
-			}
-		}
-		{
-			DynamicConverter converter = new CallerDataConverter();
-			this.optionList.clear();
-			this.optionList.add("2");
-			this.optionList.add("XXX");
-			this.optionList.add("+");
-			converter.setOptionList(this.optionList);
-			converter.start();
-
-			StringBuffer buf = new StringBuffer();
-			LoggingEvent event = makeLoggingEvent(null);
-			event.setMarker(MarkerFactory.getMarker("YYY"));
-			converter.write(buf, event);
-			if (buf.length() < 10) {
-				fail("buf is too short");
-			}
-		}
-
-		{
-			DynamicConverter converter = new CallerDataConverter();
-			this.optionList.clear();
-			this.optionList.add("2");
-			this.optionList.add("XXX");
-			this.optionList.add("*");
-			converter.setOptionList(this.optionList);
-			converter.start();
-
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, le);
-			if (buf.length() < 10) {
-				fail("buf is too short");
-			}
-			System.out.println(buf);
-		}
-
-	}
-
-	public void testRelativeTime() throws Exception {
-		{
-			DynamicConverter converter = new RelativeTimeConverter();
-			Thread.sleep(100);
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, makeLoggingEvent(null));
-			int rt = Integer.parseInt(buf.toString());
-			if (rt < 50) {
-				fail("relative time should be > 50, but it is " + rt);
-			}
-		}
-	}
-
-	public void testSyslogStart() throws Exception {
-		{
-			DynamicConverter converter = new SyslogStartConverter();
-			this.optionList.clear();
-			this.optionList.add("MAIL");
-			converter.setOptionList(this.optionList);
-			converter.start();
-
-			LoggingEvent event = makeLoggingEvent(null);
-
-			StringBuffer buf = new StringBuffer();
-			converter.write(buf, event);
-
-			String expected = "<"
-					+ (SyslogConstants.LOG_MAIL + SyslogConstants.INFO_SEVERITY) + ">";
-			assertTrue(buf.toString().startsWith(expected));
-		}
-	}
-
-	public void testMDCConverter() throws Exception {
-		MDC.put("someKey", "someValue");
-		MDCConverter converter = new MDCConverter();
-		this.optionList.clear();
-		this.optionList.add("someKey");
-		converter.setOptionList(optionList);
-		converter.start();
-		
-		LoggingEvent event = makeLoggingEvent(null);
-		
-		String result = converter.convert(event);
-		assertEquals("someValue", result);
-	}
+  LoggerContext lc = new LoggerContext();
+  Logger logger = lc.getLogger(ConverterTest.class);
+  LoggingEvent le;
+  List<String> optionList = new ArrayList<String>();
+
+  public ConverterTest(String arg0) {
+    super(arg0);
+
+    Exception rootEx = getException("Innermost", null);
+    Exception nestedEx = getException("Nested", rootEx);
+
+    Exception ex = new Exception("Bogus exception", nestedEx);
+
+    le = makeLoggingEvent(ex);
+    // ex.printStackTrace();
+  }
+
+  // The LoggingEvent is massaged with an FCQN of FormattingConverter. This
+  // forces the
+  // returned caller information to match the caller stack for this this
+  // particular test.
+  LoggingEvent makeLoggingEvent(Exception ex) {
+    return new LoggingEvent(
+        ch.qos.logback.core.pattern.FormattingConverter.class.getName(),
+        logger, Level.INFO, "Some message", ex, null);
+  }
+
+  Exception getException(String msg, Exception cause) {
+    return new Exception(msg, cause);
+  }
+
+  protected void setUp() throws Exception {
+    super.setUp();
+  }
+
+  protected void tearDown() throws Exception {
+    super.tearDown();
+  }
+
+  public void testLineOfCaller() {
+    {
+      DynamicConverter converter = new LineOfCallerConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      // the number below should be the line number of the previous line
+      assertEquals("74", buf.toString());
+    }
+  }
+
+  public void testLevel() {
+    {
+      DynamicConverter converter = new LevelConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals("INFO", buf.toString());
+    }
+    {
+      DynamicConverter converter = new LevelConverter();
+      converter.setFormattingInfo(new FormatInfo(1, 1, true, false));
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals("I", buf.toString());
+    }
+  }
+
+  public void testThread() {
+    DynamicConverter converter = new ThreadConverter();
+    StringBuffer buf = new StringBuffer();
+    converter.write(buf, le);
+    assertEquals("main", buf.toString());
+  }
+
+  public void testMessage() {
+    DynamicConverter converter = new MessageConverter();
+    StringBuffer buf = new StringBuffer();
+    converter.write(buf, le);
+    assertEquals("Some message", buf.toString());
+  }
+
+  public void testLineSeparator() {
+    DynamicConverter converter = new LineSeparatorConverter();
+    StringBuffer buf = new StringBuffer();
+    converter.write(buf, le);
+    assertEquals(CoreGlobal.LINE_SEPARATOR, buf.toString());
+  }
+
+  public void testException() {
+    {
+      DynamicConverter converter = new ThrowableInformationConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      System.out.println(buf);
+    }
+
+    {
+      DynamicConverter converter = new ThrowableInformationConverter();
+      this.optionList.add("3");
+      converter.setOptionList(this.optionList);
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      System.out.println(buf);
+    }
+  }
+
+  public void testLogger() {
+    {
+      DynamicConverter converter = new LoggerConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals(this.getClass().getName(), buf.toString());
+    }
+
+    {
+      DynamicConverter converter = new LoggerConverter();
+      this.optionList.add("20");
+      converter.setOptionList(this.optionList);
+      converter.start();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals("c.q.l.c.p.ConverterTest", buf.toString());
+    }
+  }
+
+  public void testClass() {
+    {
+      DynamicConverter converter = new ClassOfCallerConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals(this.getClass().getName(), buf.toString());
+    }
+  }
+
+  public void testMethodOfCaller() {
+    {
+      DynamicConverter converter = new MethodOfCallerConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals("testMethodOfCaller", buf.toString());
+    }
+  }
+
+  public void testFileOfCaller() {
+    {
+      DynamicConverter converter = new FileOfCallerConverter();
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      assertEquals("ConverterTest.java", buf.toString());
+    }
+  }
+
+  public void testCallerData() {
+    {
+      DynamicConverter converter = new CallerDataConverter();
+      converter.start();
+
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      if (buf.length() < 10) {
+        fail("buf is too short");
+      }
+    }
+
+    {
+      DynamicConverter converter = new CallerDataConverter();
+      this.optionList.add("2");
+      this.optionList.add("XXX");
+      converter.setOptionList(this.optionList);
+      converter.start();
+
+      StringBuffer buf = new StringBuffer();
+      LoggingEvent event = makeLoggingEvent(null);
+      event.setMarker(MarkerFactory.getMarker("XXX"));
+      converter.write(buf, event);
+      if (buf.length() < 10) {
+        fail("buf is too short");
+      }
+    }
+
+    {
+      DynamicConverter converter = new CallerDataConverter();
+      this.optionList.clear();
+      this.optionList.add("2");
+      this.optionList.add("XXX");
+      this.optionList.add("*");
+      converter.setOptionList(this.optionList);
+      converter.start();
+
+      StringBuffer buf = new StringBuffer();
+      LoggingEvent event = makeLoggingEvent(null);
+      event.setMarker(MarkerFactory.getMarker("YYY"));
+      converter.write(buf, event);
+      if (buf.length() < 10) {
+        fail("buf is too short");
+      }
+    }
+    {
+      DynamicConverter converter = new CallerDataConverter();
+      this.optionList.clear();
+      this.optionList.add("2");
+      this.optionList.add("XXX");
+      this.optionList.add("+");
+      converter.setOptionList(this.optionList);
+      converter.start();
+
+      StringBuffer buf = new StringBuffer();
+      LoggingEvent event = makeLoggingEvent(null);
+      event.setMarker(MarkerFactory.getMarker("YYY"));
+      converter.write(buf, event);
+      if (buf.length() < 10) {
+        fail("buf is too short");
+      }
+    }
+
+    {
+      DynamicConverter converter = new CallerDataConverter();
+      this.optionList.clear();
+      this.optionList.add("2");
+      this.optionList.add("XXX");
+      this.optionList.add("*");
+      converter.setOptionList(this.optionList);
+      converter.start();
+
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, le);
+      if (buf.length() < 10) {
+        fail("buf is too short");
+      }
+      System.out.println(buf);
+    }
+
+  }
+
+  public void testRelativeTime() throws Exception {
+    {
+      DynamicConverter converter = new RelativeTimeConverter();
+      Thread.sleep(100);
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, makeLoggingEvent(null));
+      int rt = Integer.parseInt(buf.toString());
+      if (rt < 50) {
+        fail("relative time should be > 50, but it is " + rt);
+      }
+    }
+  }
+
+  public void testSyslogStart() throws Exception {
+    {
+      DynamicConverter converter = new SyslogStartConverter();
+      this.optionList.clear();
+      this.optionList.add("MAIL");
+      converter.setOptionList(this.optionList);
+      converter.start();
+
+      LoggingEvent event = makeLoggingEvent(null);
+
+      StringBuffer buf = new StringBuffer();
+      converter.write(buf, event);
+
+      String expected = "<"
+          + (SyslogConstants.LOG_MAIL + SyslogConstants.INFO_SEVERITY) + ">";
+      assertTrue(buf.toString().startsWith(expected));
+    }
+  }
+
+  public void testMDCConverter() throws Exception {
+    MDC.clear();
+    MDC.put("someKey", "someValue");
+    MDCConverter converter = new MDCConverter();
+    this.optionList.clear();
+    this.optionList.add("someKey");
+    converter.setOptionList(optionList);
+    converter.start();
+
+    LoggingEvent event = makeLoggingEvent(null);
+
+    String result = converter.convert(event);
+    assertEquals("someValue", result);
+  }
 
 }

Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java	(original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java	Tue Sep 12 18:08:02 2006
@@ -24,6 +24,7 @@
   }
   
   public void testConverWithOneEntry() {
+    MDC.clear();
     MDC.put("testKey", "testValue");
     LoggingEvent le = createLoggingEvent();
     String result = converter.convert(le);
@@ -31,6 +32,8 @@
   }
 
   public void testConverWithMultipleEntries() {
+    MDC.clear();
+    MDC.put("testKey", "testValue");
     MDC.put("testKey2", "testValue2");
     LoggingEvent le = createLoggingEvent();
     String result = converter.convert(le);

Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/PackageTest.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/PackageTest.java	(original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/PackageTest.java	Tue Sep 12 18:08:02 2006
@@ -20,6 +20,7 @@
     TestSuite suite = new TestSuite();
     suite.addTestSuite(ConverterTest.class);
     suite.addTestSuite(ClassNameAbbreviatorTest.class);
+    suite.addTestSuite(MDCConverterTest.class);
     return suite;
   }
 }
\ No newline at end of file



More information about the logback-dev mailing list