svn commit: r1731277 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

[ma...@apache.org]

Author: markt
Date: Fri Feb 19 17:57:26 2016
New Revision: 1731277

URL: http://svn.apache.org/viewvc?rev=1731277&view=rev
Log:
Make the tests implementation neutral (as long as it extends WebappClassLoaderBase)

Modified:
    tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

Modified: tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1731277&r1=1731276&r2=1731277&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Fri Feb 19 17:57:26 2016
@@ -27,6 +27,7 @@ import java.security.ProtectionDomain;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.junit.After;
@@ -69,7 +70,7 @@ public class TestWebappClassLoaderWeavin
 
     private Tomcat tomcat;
     private Context context;
-    private WebappClassLoader loader;
+    private WebappClassLoaderBase loader;
 
     @Before
     @Override
@@ -83,9 +84,9 @@ public class TestWebappClassLoaderWeavin
 
         ClassLoader loader = this.context.getLoader().getClassLoader();
         assertNotNull("The class loader should not be null.", loader);
-        assertSame("The class loader is not correct.", WebappClassLoader.class, loader.getClass());
+        assertTrue("The class loader is not correct.", loader instanceof WebappClassLoaderBase);
 
-        this.loader = (WebappClassLoader) loader;
+        this.loader = (WebappClassLoaderBase) loader;
 
     }
 
@@ -250,7 +251,7 @@ public class TestWebappClassLoaderWeavin
         result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
         assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
 
-        WebappClassLoader copiedLoader = this.loader.copyWithoutTransformers();
+        WebappClassLoaderBase copiedLoader = (WebappClassLoaderBase) this.loader.copyWithoutTransformers();
 
         result = invokeDoMethodOnClass(copiedLoader, "TesterNeverWeavedClass");
         assertEquals("The third result is not correct.", "This will never be weaved.", result);
@@ -299,7 +300,7 @@ public class TestWebappClassLoaderWeavin
         }
     }
 
-    private static String invokeDoMethodOnClass(WebappClassLoader loader, String className)
+    private static String invokeDoMethodOnClass(WebappClassLoaderBase loader, String className)
             throws Exception {
 
         Class<?> c = loader.findClass("org.apache.catalina.loader." + className);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org