Make unit tests compatible with maven2 Surefire plugin.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@425249 13f79535-47bb-0310-9956-ffa450edef68

src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java

@@ -55,7 +55,7 @@ public class FirstPriorityConfigTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -70,7 +70,7 @@ public class FirstPriorityConfigTestCase extends TestCase {
         // so we can check that the first one in the classpath is
         // used.
         PathableClassLoader containerLoader = new PathableClassLoader(null);
-        containerLoader.useSystemLoader("junit.");
+        containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         containerLoader.addLogicalLib("commons-logging");
         
         PathableClassLoader webappLoader = new PathableClassLoader(containerLoader);

src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java

@@ -62,7 +62,7 @@ public class PriorityConfigTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -77,7 +77,7 @@ public class PriorityConfigTestCase extends TestCase {
         // so we can check that the first one in the classpath is
         // used.
         PathableClassLoader containerLoader = new PathableClassLoader(null);
-        containerLoader.useSystemLoader("junit.");
+        containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         containerLoader.addLogicalLib("commons-logging");
         
         URL pri10URL = new URL(baseUrl, "priority10/");

src/test/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java

@@ -41,7 +41,8 @@ public class CustomConfigAPITestCase extends CustomConfigTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
+
         // the TestHandler class must be accessable from the System classloader
         // in order for java.util.logging.LogManager.readConfiguration to
         // be able to instantiate it. And this test case must see the same

src/test/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java

@@ -42,7 +42,8 @@ public class CustomConfigFullTestCase extends CustomConfigTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
+
         // the TestHandler class must be accessable from the System classloader
         // in order for java.util.logging.LogManager.readConfiguration to
         // be able to instantiate it. And this test case must see the same

src/test/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java

@@ -36,7 +36,7 @@ public class ApiClasspathStandardTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
         parent.addLogicalLib("commons-logging-api");
 
         PathableClassLoader child = new PathableClassLoader(parent);

src/test/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java

@@ -34,7 +34,7 @@ public class AppClasspathStandardTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader loader = new PathableClassLoader(null);
-        loader.useSystemLoader("junit.");
+        loader.useExplicitLoader("junit.", Test.class.getClassLoader());
         loader.addLogicalLib("testclasses");
         loader.addLogicalLib("log4j12");
         loader.addLogicalLib("commons-logging");

src/test/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java

@@ -35,7 +35,7 @@ public class ChildClasspathStandardTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
 
         PathableClassLoader child = new PathableClassLoader(parent);
         child.addLogicalLib("testclasses");

src/test/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java

@@ -34,7 +34,7 @@ public class ParentClasspathStandardTestCase {
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
         parent.addLogicalLib("commons-logging");
         parent.addLogicalLib("log4j12");
 

src/test/org/apache/commons/logging/logkit/StandardTestCase.java

@@ -67,7 +67,7 @@ public class StandardTestCase extends AbstractLogTest {
         Class thisClass = StandardTestCase.class;
 
         PathableClassLoader loader = new PathableClassLoader(null);
-        loader.useSystemLoader("junit.");
+        loader.useExplicitLoader("junit.", Test.class.getClassLoader());
         loader.addLogicalLib("testclasses");
         loader.addLogicalLib("commons-logging");
         loader.addLogicalLib("logkit");

src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java

@@ -57,7 +57,7 @@ public class SecurityAllowedTestCase extends TestCase
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
         parent.addLogicalLib("commons-logging");
         parent.addLogicalLib("testclasses");
 

src/test/org/apache/commons/logging/security/SecurityForbiddenTestCase.java

@@ -60,7 +60,7 @@ public class SecurityForbiddenTestCase extends TestCase
      */
     public static Test suite() throws Exception {
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
         parent.addLogicalLib("commons-logging");
         parent.addLogicalLib("testclasses");
 

src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java

@@ -44,7 +44,7 @@ public class BasicServletTestCase extends TestCase {
         // that class is deployed via a shared classloader.
 
         PathableClassLoader parent = new PathableClassLoader(null);
-        parent.useSystemLoader("junit.");
+        parent.useExplicitLoader("junit.", Test.class.getClassLoader());
         parent.addLogicalLib("commons-logging");
         parent.addLogicalLib("servletapi");
 

src/test/org/apache/commons/logging/simple/CustomConfigTestCase.java

@@ -109,7 +109,7 @@ public class CustomConfigTestCase extends DefaultConfigTestCase {
         Class thisClass = CustomConfigTestCase.class;
 
         PathableClassLoader loader = new PathableClassLoader(null);
-        loader.useSystemLoader("junit.");
+        loader.useExplicitLoader("junit.", Test.class.getClassLoader());
         loader.addLogicalLib("testclasses");
         loader.addLogicalLib("commons-logging");
         

src/test/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java

@@ -50,7 +50,7 @@ public class DateTimeCustomConfigTestCase extends CustomConfigTestCase {
         Class thisClass = DateTimeCustomConfigTestCase.class;
 
         PathableClassLoader loader = new PathableClassLoader(null);
-        loader.useSystemLoader("junit.");
+        loader.useExplicitLoader("junit.", Test.class.getClassLoader());
         loader.addLogicalLib("testclasses");
         loader.addLogicalLib("commons-logging");
         

src/test/org/apache/commons/logging/simple/DefaultConfigTestCase.java

@@ -78,7 +78,7 @@ public class DefaultConfigTestCase extends TestCase {
         Class thisClass = DefaultConfigTestCase.class;
 
         PathableClassLoader loader = new PathableClassLoader(null);
-        loader.useSystemLoader("junit.");
+        loader.useExplicitLoader("junit.", Test.class.getClassLoader());
         loader.addLogicalLib("testclasses");
         loader.addLogicalLib("commons-logging");
         

src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java

@@ -31,7 +31,7 @@ public class BadTCCLTestCase extends TestCase {
 
     public static Test suite() throws Exception {
         PathableClassLoader contextClassLoader = new PathableClassLoader(null);
-        contextClassLoader.useSystemLoader("junit.");
+        contextClassLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         PathableTestSuite suite = new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader);
         return suite;
     }

src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java

@@ -55,7 +55,7 @@ public class TcclDisabledTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -71,7 +71,7 @@ public class TcclDisabledTestCase extends TestCase {
         PathableClassLoader emptyLoader = new PathableClassLoader(null);
         
         PathableClassLoader parentLoader = new PathableClassLoader(null);
-        parentLoader.useSystemLoader("junit.");
+        parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         parentLoader.addLogicalLib("commons-logging");
         parentLoader.addLogicalLib("testclasses");
         // hack to ensure that the testcase classloader can't see

src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java

@@ -55,7 +55,7 @@ public class TcclEnabledTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -71,7 +71,7 @@ public class TcclEnabledTestCase extends TestCase {
         PathableClassLoader emptyLoader = new PathableClassLoader(null);
         
         PathableClassLoader parentLoader = new PathableClassLoader(null);
-        parentLoader.useSystemLoader("junit.");
+        parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         parentLoader.addLogicalLib("commons-logging");
         parentLoader.addLogicalLib("testclasses");
         // hack to ensure that the testcase classloader can't see

src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java

@@ -55,7 +55,7 @@ public class TcclDisabledTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -72,7 +72,7 @@ public class TcclDisabledTestCase extends TestCase {
         PathableClassLoader emptyLoader = new PathableClassLoader(null);
         
         PathableClassLoader parentLoader = new PathableClassLoader(null);
-        parentLoader.useSystemLoader("junit.");
+        parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         parentLoader.addLogicalLib("commons-logging");
         parentLoader.addLogicalLib("testclasses");
         // hack to ensure that the testcase classloader can't see

src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java

@@ -49,7 +49,7 @@ public class TcclEnabledTestCase extends TestCase {
         // class through a dummy loader though this is not absolutely
         // necessary...
         PathableClassLoader dummy = new PathableClassLoader(null);
-        dummy.useSystemLoader("junit.");
+        dummy.useExplicitLoader("junit.", Test.class.getClassLoader());
         dummy.addLogicalLib("testclasses");
         dummy.addLogicalLib("commons-logging");
         
@@ -66,7 +66,7 @@ public class TcclEnabledTestCase extends TestCase {
         PathableClassLoader emptyLoader = new PathableClassLoader(null);
         
         PathableClassLoader parentLoader = new PathableClassLoader(null);
-        parentLoader.useSystemLoader("junit.");
+        parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
         parentLoader.addLogicalLib("commons-logging");
         parentLoader.addLogicalLib("testclasses");
         // hack to ensure that the testcase classloader can't see