svn commit: r1643817 - /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java

[bu...@apache.org]

Author: burn
Date: Mon Dec  8 13:43:38 2014
New Revision: 1643817

URL: http://svn.apache.org/r1643817
Log:
UIMA-4110 Fix tests to not depend on other projects being built

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java?rev=1643817&r1=1643816&r2=1643817&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java Mon Dec  8 13:43:38 2014
@@ -193,8 +193,8 @@ public class TestClassLoading extends AT
 
     // First set up a private class-loaded and verify that its resources exist 
     // and are not also in the system class-loader.
-    String privateCP = "../uima-ducc-sm/target/classes";
-    String privateClass = "org.apache.uima.ducc.sm.PingDriver";
+    String privateCP = "src/test/java/";
+    String privateResource = "org/apache/uima/ducc/container/jd/test/TestClassLoading.java";
     String publicClass = "org.apache.uima.ducc.container.common.Util";
     
     URLClassLoader scl = (URLClassLoader) ClassLoader.getSystemClassLoader();
@@ -211,17 +211,15 @@ public class TestClassLoading extends AT
       }
     }
     
-    // Check that a private class can only be loaded from the private class-loader
+    // Check that a private resource can only be loaded from the private class-loader
     // i.e. no leakage from private to system
-    try {
-      scl.loadClass(privateClass);
-      fail("Found private class in system class-loader");
-    } catch (ClassNotFoundException e) {
+    // (Can't use a class as all in this project are in the public classpath)
+    if (scl.findResource(privateResource) != null) { 
+      fail("Found private resource in system class-loader");
     }
-    try {
-      pcl.loadClass(privateClass);
-    } catch (ClassNotFoundException e) {
-      fail("Cannot load private class");
+    if (pcl.findResource(privateResource) == null) {
+      PrivateClassLoader.dump(pcl, 1);
+      fail("Cannot load private resource");
     }
 
     // Check that a public class can only be loaded from the system class-loader
@@ -244,7 +242,7 @@ public class TestClassLoading extends AT
 
     // Set up a private class-loader with a couple of missing 
     // or invalid entries that should be quietly ignored
-    String[] privateCP = {"../uima-ducc-sm/target/classes",
+    String[] privateCP = {"target/classes",
                           "pom.xml*",
                           "unknown-file.jar",
                           "unknown-wildcard/*"};