You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/10/09 16:46:12 UTC
svn commit: r823570 -
/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
Author: rickmcguire
Date: Fri Oct 9 14:46:11 2009
New Revision: 823570
URL: http://svn.apache.org/viewvc?rev=823570&view=rev
Log:
Fix RMI class loader test to match version in trunk
Modified:
geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java?rev=823570&r1=823569&r2=823570&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java Fri Oct 9 14:46:11 2009
@@ -40,7 +40,7 @@
protected void setUp() throws Exception {
File dir = new File(System.getProperty("user.home"));
- baseURL = dir.toURI().toURL().toString();
+ baseURL = dir.toURL().toString();
if (baseURL.endsWith("/")) {
baseURL = baseURL.substring(0, baseURL.length() - 1);
}
@@ -64,19 +64,19 @@
assertEquals(normalizedBaseURL + "/Apache%20Group/Geronimo " +
normalizedBaseURL + "/Apache%20Group/Apache2", normal);
}
-
+
public void testGetClassAnnotationWithClassLoaderServerAware() throws Exception {
String url1 = "http://localhost:8090/Tester1";
String url2 = "http://localhost:8090/Tester2";
MockClassLoader cl = new MockClassLoader(getClass().getClassLoader(), new URL[] {new URL(url1), new URL(url2)});
Class clazz = cl.loadClass(RMIClassLoaderSpiImplTest.class.getName());
-
+
RMIClassLoaderSpiImpl impl = new RMIClassLoaderSpiImpl();
String annotations = impl.getClassAnnotation(clazz);
assertEquals(url1 + " " + url2, annotations);
}
-
+
private static class MockClassLoader extends ClassLoader implements RMIClassLoaderSpiImpl.ClassLoaderServerAware {
private final ClassLoader delegate;
private final URL[] urls;
@@ -85,7 +85,7 @@
this.delegate = delegate;
this.urls = urls;
}
-
+
public Class loadClass(String name) throws ClassNotFoundException {
if (name.startsWith("java")) {
return delegate.loadClass(name);
@@ -115,8 +115,8 @@
}
}
}
- }
-
+ }
+
public URL[] getClassLoaderServerURLs() {
return urls;
}