From e7a60508bb9acd6bd0fdf3ee802d2d331d5a4e2d Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Tue, 15 Aug 2006 20:50:40 +0000 Subject: [PATCH] minor changes --- .../test/java/org/slf4j/InvocationTest.java | 4 +- .../test/java/org/slf4j/InvocatonTest.java | 4 +- .../test/java/org/slf4j/InvocatonTest.java | 4 +- .../test/java/org/slf4j/InvocatonTest.java | 4 +- .../test/java/org/slf4j/InvocationTest.java | 121 ++++++++++++++++++ .../test/java/org/slf4j/InvokingSLF4J.java | 121 ------------------ 6 files changed, 129 insertions(+), 129 deletions(-) rename slf4j-nop/src/test/java/org/slf4j/InvokingSLF4J.java => slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java (94%) rename slf4j-jcl/src/test/java/org/slf4j/InvokingSLF4J.java => slf4j-jdk14/src/test/java/org/slf4j/InvocatonTest.java (94%) rename slf4j-jdk14/src/test/java/org/slf4j/InvokingSLF4J.java => slf4j-log4j12/src/test/java/org/slf4j/InvocatonTest.java (94%) rename slf4j-log4j12/src/test/java/org/slf4j/InvokingSLF4J.java => slf4j-nop/src/test/java/org/slf4j/InvocatonTest.java (94%) create mode 100644 slf4j-simple/src/test/java/org/slf4j/InvocationTest.java delete mode 100644 slf4j-simple/src/test/java/org/slf4j/InvokingSLF4J.java diff --git a/slf4j-nop/src/test/java/org/slf4j/InvokingSLF4J.java b/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java similarity index 94% rename from slf4j-nop/src/test/java/org/slf4j/InvokingSLF4J.java rename to slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java index 6fc8f3fe..4e055c78 100644 --- a/slf4j-nop/src/test/java/org/slf4j/InvokingSLF4J.java +++ b/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java @@ -42,9 +42,9 @@ import junit.framework.TestCase; * @author Ceki Gulcu * */ -public class InvokingSLF4J extends TestCase { +public class InvocationTest extends TestCase { - public InvokingSLF4J (String arg0) { + public InvocationTest (String arg0) { super(arg0); } diff --git a/slf4j-jcl/src/test/java/org/slf4j/InvokingSLF4J.java b/slf4j-jdk14/src/test/java/org/slf4j/InvocatonTest.java similarity index 94% rename from slf4j-jcl/src/test/java/org/slf4j/InvokingSLF4J.java rename to slf4j-jdk14/src/test/java/org/slf4j/InvocatonTest.java index 6fc8f3fe..76b162f3 100644 --- a/slf4j-jcl/src/test/java/org/slf4j/InvokingSLF4J.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/InvocatonTest.java @@ -42,9 +42,9 @@ import junit.framework.TestCase; * @author Ceki Gulcu * */ -public class InvokingSLF4J extends TestCase { +public class InvocatonTest extends TestCase { - public InvokingSLF4J (String arg0) { + public InvocatonTest (String arg0) { super(arg0); } diff --git a/slf4j-jdk14/src/test/java/org/slf4j/InvokingSLF4J.java b/slf4j-log4j12/src/test/java/org/slf4j/InvocatonTest.java similarity index 94% rename from slf4j-jdk14/src/test/java/org/slf4j/InvokingSLF4J.java rename to slf4j-log4j12/src/test/java/org/slf4j/InvocatonTest.java index 6fc8f3fe..76b162f3 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/InvokingSLF4J.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/InvocatonTest.java @@ -42,9 +42,9 @@ import junit.framework.TestCase; * @author Ceki Gulcu * */ -public class InvokingSLF4J extends TestCase { +public class InvocatonTest extends TestCase { - public InvokingSLF4J (String arg0) { + public InvocatonTest (String arg0) { super(arg0); } diff --git a/slf4j-log4j12/src/test/java/org/slf4j/InvokingSLF4J.java b/slf4j-nop/src/test/java/org/slf4j/InvocatonTest.java similarity index 94% rename from slf4j-log4j12/src/test/java/org/slf4j/InvokingSLF4J.java rename to slf4j-nop/src/test/java/org/slf4j/InvocatonTest.java index 6fc8f3fe..76b162f3 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/InvokingSLF4J.java +++ b/slf4j-nop/src/test/java/org/slf4j/InvocatonTest.java @@ -42,9 +42,9 @@ import junit.framework.TestCase; * @author Ceki Gulcu * */ -public class InvokingSLF4J extends TestCase { +public class InvocatonTest extends TestCase { - public InvokingSLF4J (String arg0) { + public InvocatonTest (String arg0) { super(arg0); } diff --git a/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java b/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java new file mode 100644 index 00000000..4e055c78 --- /dev/null +++ b/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2004-2005 SLF4J.ORG + * Copyright (c) 2004-2005 QOS.CH + * + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons + * to whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY + * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, use + * or other dealings in this Software without prior written authorization + * of the copyright holder. + * + */ + +package org.slf4j; + +import junit.framework.TestCase; + + +/** + * Test whether invoking the SLF4J API causes problems or not. + * + * @author Ceki Gulcu + * + */ +public class InvocationTest extends TestCase { + + public InvocationTest (String arg0) { + super(arg0); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void test1() { + Logger logger = LoggerFactory.getLogger("test1"); + logger.debug("Hello world."); + } + + public void test2() { + Integer i1 = new Integer(1); + Integer i2 = new Integer(2); + Integer i3 = new Integer(3); + Exception e = new Exception("This is a test exception."); + Logger logger = LoggerFactory.getLogger("test2"); + + 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 {}", new Integer(3)); + logger.error("Hello world 4.", e); + } + + public void testNull() { + Logger logger = LoggerFactory.getLogger("testNull"); + 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); + } + + public void testMarker() { + Logger logger = LoggerFactory.getLogger("testMarker"); + Marker blue = MarkerFactory.getMarker("BLUE"); + 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"); + } +} diff --git a/slf4j-simple/src/test/java/org/slf4j/InvokingSLF4J.java b/slf4j-simple/src/test/java/org/slf4j/InvokingSLF4J.java deleted file mode 100644 index 6fc8f3fe..00000000 --- a/slf4j-simple/src/test/java/org/slf4j/InvokingSLF4J.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * Copyright (c) 2004-2005 QOS.CH - * - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j; - -import junit.framework.TestCase; - - -/** - * Test whether invoking the SLF4J API causes problems or not. - * - * @author Ceki Gulcu - * - */ -public class InvokingSLF4J extends TestCase { - - public InvokingSLF4J (String arg0) { - super(arg0); - } - - protected void setUp() throws Exception { - super.setUp(); - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - - public void test1() { - Logger logger = LoggerFactory.getLogger("test1"); - logger.debug("Hello world."); - } - - public void test2() { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); - Exception e = new Exception("This is a test exception."); - Logger logger = LoggerFactory.getLogger("test2"); - - 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 {}", new Integer(3)); - logger.error("Hello world 4.", e); - } - - public void testNull() { - Logger logger = LoggerFactory.getLogger("testNull"); - 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); - } - - public void testMarker() { - Logger logger = LoggerFactory.getLogger("testMarker"); - Marker blue = MarkerFactory.getMarker("BLUE"); - 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"); - } -}