(parentValue);
}
- }
-
- static boolean IS_JDK14 = isJDK14();
+ };
/**
* Put a context value (the val parameter) as identified with
* the key parameter into the current thread's context map.
* Note that contrary to log4j, the val parameter can be null.
- *
+ *
*
* If the current thread does not have a context map it is created as a side
* effect of this call.
- *
+ *
* @throws IllegalArgumentException
* in case the "key" parameter is null
*/
@@ -73,9 +71,9 @@
if (key == null) {
throw new IllegalArgumentException("key cannot be null");
}
- Map map = (Map) inheritableThreadLocal.get();
+ Map map = inheritableThreadLocal.get();
if (map == null) {
- map = Collections. synchronizedMap(new HashMap());
+ map = new HashMap();
inheritableThreadLocal.set(map);
}
map.put(key, val);
@@ -85,9 +83,9 @@
* Get the context identified by the key parameter.
*/
public String get(String key) {
- Map Map = (Map) inheritableThreadLocal.get();
- if ((Map != null) && (key != null)) {
- return (String) Map.get(key);
+ Map map = inheritableThreadLocal.get();
+ if ((map != null) && (key != null)) {
+ return map.get(key);
} else {
return null;
}
@@ -97,7 +95,7 @@
* Remove the the context identified by the key parameter.
*/
public void remove(String key) {
- Map map = (Map) inheritableThreadLocal.get();
+ Map map = inheritableThreadLocal.get();
if (map != null) {
map.remove(key);
}
@@ -107,27 +105,21 @@
* Clear all entries in the MDC.
*/
public void clear() {
- Map map = (Map) inheritableThreadLocal.get();
+ Map map = inheritableThreadLocal.get();
if (map != null) {
map.clear();
- // the InheritableThreadLocal.remove method was introduced in JDK 1.5
- // Thus, invoking clear() on previous JDK 1.4 will fail
- if (isJDK14()) {
- inheritableThreadLocal.set(null);
- } else {
- inheritableThreadLocal.remove();
- }
+ inheritableThreadLocal.remove();
}
}
/**
* Returns the keys in the MDC as a {@link Set} of {@link String}s The
* returned value can be null.
- *
+ *
* @return the keys in the MDC
*/
public Set getKeys() {
- Map map = (Map) inheritableThreadLocal.get();
+ Map map = inheritableThreadLocal.get();
if (map != null) {
return map.keySet();
} else {
@@ -136,26 +128,20 @@
}
/**
- * Return a copy of the current thread's context map.
+ * Return a copy of the current thread's context map.
* Returned value may be null.
- *
+ *
*/
public Map getCopyOfContextMap() {
- Map oldMap = (Map) inheritableThreadLocal.get();
+ Map oldMap = inheritableThreadLocal.get();
if (oldMap != null) {
- Map newMap = Collections. synchronizedMap(new HashMap());
- synchronized (oldMap) {
- newMap.putAll(oldMap);
- }
- return newMap;
+ return new HashMap(oldMap);
} else {
return null;
}
}
public void setContextMap(Map contextMap) {
- Map map = Collections. synchronizedMap(new HashMap(contextMap));
- inheritableThreadLocal.set(map);
+ inheritableThreadLocal.set(new HashMap(contextMap));
}
-
}
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
index 14b5308..7ed253d 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
@@ -101,7 +101,7 @@
int size = referenceList.size();
for (int i = 0; i < size; i++) {
- Marker m = (Marker) referenceList.get(i);
+ Marker m = referenceList.get(i);
if (referenceToRemove.equals(m)) {
referenceList.remove(i);
return true;
@@ -120,8 +120,7 @@
}
if (hasReferences()) {
- for (int i = 0; i < referenceList.size(); i++) {
- Marker ref = (Marker) referenceList.get(i);
+ for (Marker ref : referenceList) {
if (ref.contains(other)) {
return true;
}
@@ -143,8 +142,7 @@
}
if (hasReferences()) {
- for (int i = 0; i < referenceList.size(); i++) {
- Marker ref = (Marker) referenceList.get(i);
+ for (Marker ref : referenceList) {
if (ref.contains(name)) {
return true;
}
@@ -182,7 +180,7 @@
StringBuilder sb = new StringBuilder(this.getName());
sb.append(' ').append(OPEN);
while (it.hasNext()) {
- reference = (Marker) it.next();
+ reference = it.next();
sb.append(reference.getName());
if (it.hasNext()) {
sb.append(SEP);
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
index 2fa5435..d5a5051 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -203,34 +203,34 @@
return new FormattingTuple(messagePattern, argArray, throwableCandidate);
} else { // add the tail string which contains no variables and return
// the result.
- sbuf.append(messagePattern.substring(i, messagePattern.length()));
+ sbuf.append(messagePattern, i, messagePattern.length());
return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
}
} else {
if (isEscapedDelimeter(messagePattern, j)) {
if (!isDoubleEscaped(messagePattern, j)) {
L--; // DELIM_START was escaped, thus should not be incremented
- sbuf.append(messagePattern.substring(i, j - 1));
+ sbuf.append(messagePattern, i, j - 1);
sbuf.append(DELIM_START);
i = j + 1;
} else {
// The escape character preceding the delimiter start is
// itself escaped: "abc x:\\{}"
// we have to consume one backward slash
- sbuf.append(messagePattern.substring(i, j - 1));
+ sbuf.append(messagePattern, i, j - 1);
deeplyAppendParameter(sbuf, argArray[L], new HashMap());
i = j + 2;
}
} else {
// normal case
- sbuf.append(messagePattern.substring(i, j));
+ sbuf.append(messagePattern, i, j);
deeplyAppendParameter(sbuf, argArray[L], new HashMap());
i = j + 2;
}
}
}
// append the characters following the last {} pair.
- sbuf.append(messagePattern.substring(i, messagePattern.length()));
+ sbuf.append(messagePattern, i, messagePattern.length());
if (L < argArray.length - 1) {
return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
} else {
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
index 0a033a4..7cdf076 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
@@ -35,6 +35,27 @@
private Util() {
}
+ public static String safeGetSystemProperty(String key) {
+ if (key == null)
+ throw new IllegalArgumentException("null input");
+
+ String result = null;
+ try {
+ result = System.getProperty(key);
+ } catch (java.lang.SecurityException sm) {
+ ; // ignore
+ }
+ return result;
+ }
+
+ public static boolean safeGetBooleanSystemProperty(String key) {
+ String value = safeGetSystemProperty(key);
+ if (value == null)
+ return false;
+ else
+ return value.equalsIgnoreCase("true");
+ }
+
/**
* In order to call {@link SecurityManager#getClassContext()}, which is a
* protected method, we add this wrapper which allows the method to be visible
@@ -46,7 +67,28 @@
}
}
- private static final ClassContextSecurityManager SECURITY_MANAGER = new ClassContextSecurityManager();
+ private static ClassContextSecurityManager SECURITY_MANAGER;
+ private static boolean SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED = false;
+
+ private static ClassContextSecurityManager getSecurityManager() {
+ if(SECURITY_MANAGER != null)
+ return SECURITY_MANAGER;
+ else if(SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED)
+ return null;
+ else {
+ SECURITY_MANAGER = safeCreateSecurityManager();
+ SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED = true;
+ return SECURITY_MANAGER;
+ }
+ }
+
+ private static ClassContextSecurityManager safeCreateSecurityManager() {
+ try {
+ return new ClassContextSecurityManager();
+ } catch (java.lang.SecurityException sm) {
+ return null;
+ }
+ }
/**
* Returns the name of the class which called the invoking method.
@@ -54,7 +96,10 @@
* @return the name of the class which called the invoking method.
*/
public static Class getCallingClass() {
- Class[] trace = SECURITY_MANAGER.getClassContext();
+ ClassContextSecurityManager securityManager = getSecurityManager();
+ if(securityManager == null)
+ return null;
+ Class[] trace = securityManager.getClassContext();
String thisClassName = Util.class.getName();
// Advance until Util is found
diff --git a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
index 74666d0..7e855bb 100644
--- a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
@@ -24,10 +24,11 @@
*/
package org.slf4j;
+import static org.junit.Assert.*;
+
import java.util.Iterator;
-import junit.framework.TestCase;
-
+import org.junit.Test;
import org.slf4j.helpers.BasicMarkerFactory;
/**
@@ -36,7 +37,7 @@
* @author Ceki Gülcü
* @author Joern Huxhorn
*/
-public class BasicMarkerTest extends TestCase {
+public class BasicMarkerTest {
static final String BLUE_STR = "BLUE";
static final String RED_STR = "RED";
static final String GREEN_STR = "GREEN";
@@ -69,6 +70,7 @@
multiComp.add(comp);
}
+ @Test
public void testPrimitive() {
assertEquals(BLUE_STR, blue.getName());
assertTrue(blue.contains(blue));
@@ -80,20 +82,24 @@
assertTrue(blue2.contains(blue));
}
+ @Test
public void testPrimitiveByName() {
assertTrue(blue.contains(BLUE_STR));
}
+ @Test
public void testComposite() {
assertTrue(comp.contains(comp));
assertTrue(comp.contains(blue));
}
+ @Test
public void testCompositeByName() {
assertTrue(comp.contains(COMP_STR));
assertTrue(comp.contains(BLUE_STR));
}
+ @Test
public void testMultiComposite() {
assertTrue(multiComp.contains(comp));
assertTrue(multiComp.contains(blue));
@@ -101,6 +107,7 @@
assertFalse(multiComp.contains(red));
}
+ @Test
public void testMultiCompositeByName() {
assertTrue(multiComp.contains(COMP_STR));
assertTrue(multiComp.contains(BLUE_STR));
@@ -108,6 +115,7 @@
assertFalse(multiComp.contains(RED_STR));
}
+ @Test
public void testMultiAdd() {
Marker parent = factory.getMarker(PARENT_MARKER_STR);
Marker child = factory.getMarker(CHILD_MARKER_STR);
@@ -122,6 +130,7 @@
assertFalse(iterator.hasNext());
}
+ @Test
public void testAddRemove() {
final String NEW_PREFIX = "NEW_";
Marker parent = factory.getMarker(NEW_PREFIX + PARENT_MARKER_STR);
@@ -142,6 +151,7 @@
assertFalse(parent.remove(child));
}
+ @Test
public void testSelfRecursion() {
final String diffPrefix = "NEW_" + diff;
final String PARENT_NAME = diffPrefix + PARENT_MARKER_STR;
@@ -155,6 +165,7 @@
assertFalse(parent.contains(NOT_CONTAINED_MARKER_STR));
}
+ @Test
public void testIndirectRecursion() {
final String diffPrefix = "NEW_" + diff;
final String PARENT_NAME = diffPrefix + PARENT_MARKER_STR;
@@ -175,6 +186,7 @@
assertFalse(parent.contains(NOT_CONTAINED_MARKER_STR));
}
+ @Test
public void testHomonyms() {
final String diffPrefix = "homonym" + diff;
final String PARENT_NAME = diffPrefix + PARENT_MARKER_STR;
diff --git a/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java b/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java
index 3191275..c9f85e6 100644
--- a/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java
@@ -24,28 +24,33 @@
*/
package org.slf4j;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Random;
+import org.junit.Test;
import org.slf4j.helpers.BasicMarker;
import org.slf4j.helpers.NOPLogger;
-import junit.framework.TestCase;
-
-public class NoBindingTest extends TestCase {
+public class NoBindingTest {
int diff = new Random().nextInt(10000);
+ @Test
public void testLogger() {
Logger logger = LoggerFactory.getLogger(NoBindingTest.class);
logger.debug("hello" + diff);
assertTrue(logger instanceof NOPLogger);
}
- public void testMDC() {
+ @Test
+ public void testMDC() {
MDC.put("k" + diff, "v");
assertNull(MDC.get("k"));
}
+ @Test
public void testMarker() {
Marker m = MarkerFactory.getMarker("a" + diff);
assertTrue(m instanceof BasicMarker);
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java
new file mode 100644
index 0000000..d0df4c0
--- /dev/null
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) 2004-2013 QOS.ch, Copyright (C) 2015 Google Inc.
+ * 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, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.slf4j.helpers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.spi.MDCAdapter;
+
+/**
+ * Tests for {@link BasicMDCAdapter}
+ *
+ * @author Lukasz Cwik
+ */
+public class BasicMDCAdapterTest {
+ MDCAdapter mdc = new BasicMDCAdapter();
+
+ @After
+ public void tearDown() throws Exception {
+ mdc.clear();
+ }
+
+ @Test
+ public void testSettingAndGettingWithMDC() {
+ assertNull(mdc.get("testKey"));
+ mdc.put("testKey", "testValue");
+ assertEquals(mdc.get("testKey"), "testValue");
+ }
+
+ @Test
+ public void testOverwritingAKeyInMDC() {
+ assertNull(mdc.get("testKey"));
+ mdc.put("testKey", "testValue");
+ mdc.put("testKey", "differentTestValue");
+ assertEquals(mdc.get("testKey"), "differentTestValue");
+ }
+
+ @Test
+ public void testClearingMDC() {
+ mdc.put("testKey", "testValue");
+ assertFalse(mdc.getCopyOfContextMap().isEmpty());
+ mdc.clear();
+ assertNull(mdc.getCopyOfContextMap());
+ }
+
+ @Test
+ public void testGetCopyOfContextMapFromMDC() {
+ mdc.put("testKey", "testValue");
+ Map copy = mdc.getCopyOfContextMap();
+ mdc.put("anotherTestKey", "anotherTestValue");
+ assertFalse(copy.size() == mdc.getCopyOfContextMap().size());
+ }
+
+ @Test
+ public void testMDCInheritsValuesFromParentThread() throws Exception {
+ mdc.put("parentKey", "parentValue");
+ runAndWait(new Runnable() {
+ public void run() {
+ mdc.put("childKey", "childValue");
+ assertEquals("parentValue", mdc.get("parentKey"));
+ }
+ });
+ }
+
+ @Test
+ public void testMDCDoesntGetValuesFromChildThread() throws Exception {
+ mdc.put("parentKey", "parentValue");
+ runAndWait(new Runnable() {
+ public void run() {
+ mdc.put("childKey", "childValue");
+ }
+ });
+ assertEquals("parentValue", mdc.get("parentKey"));
+ assertNull(mdc.get("childKey"));
+ }
+
+ @Test
+ public void testMDCChildThreadCanOverwriteParentThread() throws Exception {
+ mdc.put("sharedKey", "parentValue");
+ runAndWait(new Runnable() {
+ public void run() {
+ assertEquals("parentValue", mdc.get("sharedKey"));
+ mdc.put("sharedKey", "childValue");
+ assertEquals("childValue", mdc.get("sharedKey"));
+ }
+ });
+ assertEquals("parentValue", mdc.get("sharedKey"));
+ }
+
+ private void runAndWait(Runnable runnable) throws Exception {
+ RecordingExceptionHandler handler = new RecordingExceptionHandler();
+ Thread thread = new Thread(runnable);
+ thread.setUncaughtExceptionHandler(handler);
+ thread.start();
+ try {
+ thread.join();
+ } catch (Throwable t) {
+ fail("Unexpected failure in child thread:" + t.getMessage());
+ }
+ assertFalse(handler.getMessage(), handler.hadException());
+ }
+
+ /** A {@link UncaughtExceptionHandler} that records whether the thread threw an exception. */
+ private static class RecordingExceptionHandler implements UncaughtExceptionHandler {
+ private Throwable exception;
+
+ public void uncaughtException(Thread t, Throwable e) {
+ exception = e;
+ }
+
+ boolean hadException() {
+ return exception != null;
+ }
+
+ String getMessage() {
+ return exception != null ? exception.getMessage() : "";
+ }
+ }
+}
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/BubbleSortTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/BubbleSortTest.java
index 95e1937..403ecd6 100644
--- a/slf4j-api/src/test/java/org/slf4j/helpers/BubbleSortTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/BubbleSortTest.java
@@ -24,10 +24,13 @@
*/
package org.slf4j.helpers;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Random;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Test that our BubbleSort algorithm is correctly implemented.
@@ -35,8 +38,9 @@
* @author Ceki
*
*/
-public class BubbleSortTest extends TestCase {
+public class BubbleSortTest {
+ @Test
public void testSmoke() {
int[] a = new int[] { 5, 3, 2, 7 };
BubbleSort.sort(a);
@@ -47,11 +51,13 @@
assertEquals(7, a[i++]);
}
+ @Test
public void testEmpty() {
int[] a = new int[] {};
BubbleSort.sort(a);
}
+ @Test
public void testSorted() {
int[] a = new int[] { 3, 30, 300, 3000 };
BubbleSort.sort(a);
@@ -62,6 +68,7 @@
assertEquals(3000, a[i++]);
}
+ @Test
public void testInverted() {
int[] a = new int[] { 3000, 300, 30, 3 };
BubbleSort.sort(a);
@@ -72,6 +79,7 @@
assertEquals(3000, a[i++]);
}
+ @Test
public void testWithSameEntry() {
int[] a = new int[] { 10, 20, 10, 20 };
BubbleSort.sort(a);
@@ -82,6 +90,7 @@
assertEquals(20, a[i++]);
}
+ @Test
public void testRandom() {
int len = 100;
Random random = new Random(156);
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java
index a9a7d2d..21b6a24 100644
--- a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java
@@ -26,11 +26,11 @@
import java.text.MessageFormat;
-import junit.framework.TestCase;
import org.junit.Ignore;
+import org.junit.Test;
@Ignore
-public class MessageFormatterPerfTest extends TestCase {
+public class MessageFormatterPerfTest{ //extends TestCase {
Integer i1 = new Integer(1);
Integer i2 = new Integer(2);
@@ -38,22 +38,13 @@
//
static long REFERENCE_BIPS = 48416;
- public MessageFormatterPerfTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- }
-
- protected void tearDown() throws Exception {
- }
-
public void XtestJDKFormatterPerf() {
jdkMessageFormatter(RUN_LENGTH);
double duration = jdkMessageFormatter(RUN_LENGTH);
System.out.println("jdk duration = " + duration + " nanos");
}
+ @Test
public void testSLF4JPerf_OneArg() {
slf4jMessageFormatter_OneArg(RUN_LENGTH);
double duration = slf4jMessageFormatter_OneArg(RUN_LENGTH);
@@ -62,6 +53,7 @@
BogoPerf.assertDuration(duration, referencePerf, REFERENCE_BIPS);
}
+ @Test
public void testSLF4JPerf_TwoArg() {
slf4jMessageFormatter_TwoArg(RUN_LENGTH);
double duration = slf4jMessageFormatter_TwoArg(RUN_LENGTH);
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java
index 9484445..ab076fc 100644
--- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java
@@ -24,6 +24,9 @@
*/
package org.slf4j.helpers;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -34,15 +37,16 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
+import org.junit.Test;
import org.slf4j.Logger;
/**
* @author Chetan Mehrotra
*/
-public class SubstitutableLoggerTest extends TestCase {
+public class SubstitutableLoggerTest {
private static final Set EXCLUDED_METHODS = new HashSet(Arrays.asList("getName"));
+ @Test
public void testDelegate() throws Exception {
SubstituteLogger log = new SubstituteLogger("foo");
assertTrue(log.delegate() instanceof NOPLogger);
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java
index 2771205..246f9c4 100644
--- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java
@@ -24,16 +24,21 @@
*/
package org.slf4j.helpers;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
import org.slf4j.Logger;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-public class SubstituteLoggerFactoryTest extends TestCase {
+public class SubstituteLoggerFactoryTest {
private SubstituteLoggerFactory factory = new SubstituteLoggerFactory();
+ @Test
public void testFactory() {
Logger log = factory.getLogger("foo");
assertNotNull(log);
@@ -42,6 +47,7 @@
assertTrue("Loggers with same name must be same", log == log2);
}
+ @Test
public void testLoggerNameList() {
factory.getLogger("foo1");
factory.getLogger("foo2");
@@ -52,6 +58,7 @@
assertEquals(expectedNames, actualNames);
}
+ @Test
public void testLoggers() {
factory.getLogger("foo1");
factory.getLogger("foo2");
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index af8dbe9..38fb357 100644
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -1,5 +1,5 @@
-
+
4.0.0
@@ -7,7 +7,7 @@
org.slf4j
slf4j-parent
- 1.7.12
+ 1.7.13
slf4j-ext
@@ -48,21 +48,12 @@
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- ${required.jdk.version}
- ${required.jdk.version}
-
-
-
+
org.apache.maven.plugins
maven-surefire-plugin
-
+
false
once
plain
@@ -74,32 +65,21 @@
-
org.apache.maven.plugins
maven-jar-plugin
- ${parsedVersion.osgiVersion}
- ${project.description}
- ${project.version}
org.slf4j.agent.AgentPremain
../../../../javassist/javassist/3.4.GA/javassist-3.4.GA.jar javassist-3.4.GA.jar javassist.jar
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
+
+