diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java index 20c53e02a..f5073381a 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; import java.util.HashMap; @@ -51,160 +50,160 @@ */ public class InvocationTest { - ListAppender listAppender = new ListAppender(); - org.apache.log4j.Logger root; - - @Before - public void setUp() throws Exception { - root = org.apache.log4j.Logger.getRootLogger(); - root.addAppender(listAppender); - } - - @After - public void tearDown() throws Exception { - root.getLoggerRepository().resetConfiguration(); - } - - @Test - public void test1() { - - Logger logger = LoggerFactory.getLogger("test1"); - logger.debug("Hello world."); - assertEquals(1, listAppender.list.size()); - } - - @Test - public void test2() { - Integer i1 = Integer.valueOf(1); - Integer i2 = Integer.valueOf(2); - Integer i3 = Integer.valueOf(3); - Exception e = new Exception("This is a test exception."); - Logger logger = LoggerFactory.getLogger("test2"); - - logger.trace("Hello trace."); - - logger.debug("Hello world 1."); - logger.debug("Hello world {}", i1); - logger.debug("val={} val={}", i1, i2); - logger.debug("val={} val={} val={}", new Object[] { i1, i2, i3 }); - - logger.debug("Hello world 2", e); - logger.info("Hello world 2."); - - logger.warn("Hello world 3."); - logger.warn("Hello world 3", e); - - logger.error("Hello world 4."); - logger.error("Hello world {}", Integer.valueOf(3)); - logger.error("Hello world 4.", e); - assertEquals(11, listAppender.list.size()); - } - - @Test - public void testNull() { - Logger logger = LoggerFactory.getLogger("testNull"); - logger.trace(null); - logger.debug(null); - logger.info(null); - logger.warn(null); - logger.error(null); - - Exception e = new Exception("This is a test exception."); - logger.debug(null, e); - logger.info(null, e); - logger.warn(null, e); - logger.error(null, e); - assertEquals(8, listAppender.list.size()); - } - - // http://jira.qos.ch/browse/SLF4J-69 - // formerly http://bugzilla.slf4j.org/show_bug.cgi?id=78 - @Test - public void testNullParameter_BUG78() { - Logger logger = LoggerFactory.getLogger("testNullParameter_BUG78"); - String[] parameters = null; - String msg = "hello {}"; - - logger.debug(msg, (Object[]) parameters); - - assertEquals(1, listAppender.list.size()); - LoggingEvent e = (LoggingEvent) listAppender.list.get(0); - assertEquals(msg, e.getMessage()); - } - - @Test - public void testMarker() { - Logger logger = LoggerFactory.getLogger("testMarker"); - Marker blue = MarkerFactory.getMarker("BLUE"); - logger.trace(blue, "hello"); - logger.debug(blue, "hello"); - logger.info(blue, "hello"); - logger.warn(blue, "hello"); - logger.error(blue, "hello"); - - logger.debug(blue, "hello {}", "world"); - logger.info(blue, "hello {}", "world"); - logger.warn(blue, "hello {}", "world"); - logger.error(blue, "hello {}", "world"); - - logger.debug(blue, "hello {} and {} ", "world", "universe"); - logger.info(blue, "hello {} and {} ", "world", "universe"); - logger.warn(blue, "hello {} and {} ", "world", "universe"); - logger.error(blue, "hello {} and {} ", "world", "universe"); - assertEquals(12, listAppender.list.size()); - } - - @Test - public void testMDC() { - MDC.put("k", "v"); - assertNotNull(MDC.get("k")); - assertEquals("v", MDC.get("k")); - - MDC.remove("k"); - assertNull(MDC.get("k")); - - MDC.put("k1", "v1"); - assertEquals("v1", MDC.get("k1")); - MDC.clear(); - assertNull(MDC.get("k1")); - - try { - MDC.put(null, "x"); - fail("null keys are invalid"); - } catch (IllegalArgumentException e) { - } - } - - @Test - public void testMDCContextMapValues() { - Map map = new HashMap(); - map.put("ka", "va"); - map.put("kb", "vb"); - - MDC.put("k", "v"); - assertEquals("v", MDC.get("k")); - MDC.setContextMap(map); - assertNull(MDC.get("k")); - assertEquals("va", MDC.get("ka")); - assertEquals("vb", MDC.get("kb")); - } - - @Test - public void testCallerInfo() { - Logger logger = LoggerFactory.getLogger("testMarker"); - listAppender.extractLocationInfo = true; - logger.debug("hello"); - LoggingEvent event = listAppender.list.get(0); - assertEquals(this.getClass().getName(), event.getLocationInformation().getClassName()); - } - - @Test - public void testCallerInfoWithFluentAPI() { - Logger logger = LoggerFactory.getLogger("testMarker"); - listAppender.extractLocationInfo = true; - logger.atDebug().log("hello"); - LoggingEvent event = listAppender.list.get(0); - assertEquals(this.getClass().getName(), event.getLocationInformation().getClassName()); - } + ListAppender listAppender = new ListAppender(); + org.apache.log4j.Logger root; + + @Before + public void setUp() throws Exception { + root = org.apache.log4j.Logger.getRootLogger(); + root.addAppender(listAppender); + } + + @After + public void tearDown() throws Exception { + root.getLoggerRepository().resetConfiguration(); + } + + @Test + public void test1() { + + Logger logger = LoggerFactory.getLogger("test1"); + logger.debug("Hello world."); + assertEquals(1, listAppender.list.size()); + } + + @Test + public void test2() { + Integer i1 = Integer.valueOf(1); + Integer i2 = Integer.valueOf(2); + Integer i3 = Integer.valueOf(3); + Exception e = new Exception("This is a test exception."); + Logger logger = LoggerFactory.getLogger("test2"); + + logger.trace("Hello trace."); + + logger.debug("Hello world 1."); + logger.debug("Hello world {}", i1); + logger.debug("val={} val={}", i1, i2); + logger.debug("val={} val={} val={}", new Object[] { i1, i2, i3 }); + + logger.debug("Hello world 2", e); + logger.info("Hello world 2."); + + logger.warn("Hello world 3."); + logger.warn("Hello world 3", e); + + logger.error("Hello world 4."); + logger.error("Hello world {}", Integer.valueOf(3)); + logger.error("Hello world 4.", e); + assertEquals(11, listAppender.list.size()); + } + + @Test + public void testNull() { + Logger logger = LoggerFactory.getLogger("testNull"); + logger.trace(null); + logger.debug(null); + logger.info(null); + logger.warn(null); + logger.error(null); + + Exception e = new Exception("This is a test exception."); + logger.debug(null, e); + logger.info(null, e); + logger.warn(null, e); + logger.error(null, e); + assertEquals(8, listAppender.list.size()); + } + + // http://jira.qos.ch/browse/SLF4J-69 + // formerly http://bugzilla.slf4j.org/show_bug.cgi?id=78 + @Test + public void testNullParameter_BUG78() { + Logger logger = LoggerFactory.getLogger("testNullParameter_BUG78"); + String[] parameters = null; + String msg = "hello {}"; + + logger.debug(msg, (Object[]) parameters); + + assertEquals(1, listAppender.list.size()); + LoggingEvent e = (LoggingEvent) listAppender.list.get(0); + assertEquals(msg, e.getMessage()); + } + + @Test + public void testMarker() { + Logger logger = LoggerFactory.getLogger("testMarker"); + Marker blue = MarkerFactory.getMarker("BLUE"); + logger.trace(blue, "hello"); + logger.debug(blue, "hello"); + logger.info(blue, "hello"); + logger.warn(blue, "hello"); + logger.error(blue, "hello"); + + logger.debug(blue, "hello {}", "world"); + logger.info(blue, "hello {}", "world"); + logger.warn(blue, "hello {}", "world"); + logger.error(blue, "hello {}", "world"); + + logger.debug(blue, "hello {} and {} ", "world", "universe"); + logger.info(blue, "hello {} and {} ", "world", "universe"); + logger.warn(blue, "hello {} and {} ", "world", "universe"); + logger.error(blue, "hello {} and {} ", "world", "universe"); + assertEquals(12, listAppender.list.size()); + } + + @Test + public void testMDC() { + MDC.put("k", "v"); + assertNotNull(MDC.get("k")); + assertEquals("v", MDC.get("k")); + + MDC.remove("k"); + assertNull(MDC.get("k")); + + MDC.put("k1", "v1"); + assertEquals("v1", MDC.get("k1")); + MDC.clear(); + assertNull(MDC.get("k1")); + + try { + MDC.put(null, "x"); + fail("null keys are invalid"); + } catch (IllegalArgumentException e) { + } + } + + @Test + public void testMDCContextMapValues() { + Map map = new HashMap(); + map.put("ka", "va"); + map.put("kb", "vb"); + + MDC.put("k", "v"); + assertEquals("v", MDC.get("k")); + MDC.setContextMap(map); + assertNull(MDC.get("k")); + assertEquals("va", MDC.get("ka")); + assertEquals("vb", MDC.get("kb")); + } + + @Test + public void testCallerInfo() { + Logger logger = LoggerFactory.getLogger("testMarker"); + listAppender.extractLocationInfo = true; + logger.debug("hello"); + LoggingEvent event = listAppender.list.get(0); + assertEquals(this.getClass().getName(), event.getLocationInformation().getClassName()); + } + + @Test + public void testCallerInfoWithFluentAPI() { + Logger logger = LoggerFactory.getLogger("testMarker"); + listAppender.extractLocationInfo = true; + logger.atDebug().log("hello"); + LoggingEvent event = listAppender.list.get(0); + assertEquals(this.getClass().getName(), event.getLocationInformation().getClassName()); + } }