Author: markt
Date: Fri Sep 25 07:18:42 2015
New Revision: 1705233
URL: http://svn.apache.org/viewvc?rev=1705233&view=rev
Log:
Fix test broken during refactoring to add support for parallel class loading
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1705233&r1=1705232&r2=1705233&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Fri Sep 25 07:18:42 2015
@@ -69,7 +69,7 @@ public class TestWebappClassLoaderWeavin
private Tomcat tomcat;
private Context context;
- private WebappClassLoaderBase loader;
+ private WebappClassLoader loader;
@Before
@Override
@@ -83,9 +83,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.",
WebappClassLoaderBase.class, loader.getClass());
+ assertSame("The class loader is not correct.",
WebappClassLoader.class, loader.getClass());
- this.loader = (WebappClassLoaderBase) loader;
+ this.loader = (WebappClassLoader) loader;
}
@@ -250,7 +250,7 @@ public class TestWebappClassLoaderWeavin
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
assertEquals("The second result is not correct.", "Hello, Weaver #2!",
result);
- WebappClassLoader copiedLoader = (WebappClassLoader)
this.loader.copyWithoutTransformers();
+ WebappClassLoader copiedLoader = this.loader.copyWithoutTransformers();
result = invokeDoMethodOnClass(copiedLoader, "TesterNeverWeavedClass");
assertEquals("The third result is not correct.", "This will never be
weaved.", result);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
