svn commit: r381016 - in /incubator/tuscany/java/spec/sdo/src/test: java/commonj/sdo/impl/HelperProviderTestCase.java resources/META-INF/ resources/default/ resources/default/META-INF/

[jb...@apache.org]

Author: jboynes
Date: Sat Feb 25 15:11:11 2006
New Revision: 381016

URL: http://svn.apache.org/viewcvs?rev=381016&view=rev
Log:
remove test HelperProvider impl from classpath to support frameworks like Eclipse
that include the test classpath in dependent projects

Added:
    incubator/tuscany/java/spec/sdo/src/test/resources/default/
    incubator/tuscany/java/spec/sdo/src/test/resources/default/META-INF/
      - copied from r380947, incubator/tuscany/java/spec/sdo/src/test/resources/META-INF/
Removed:
    incubator/tuscany/java/spec/sdo/src/test/resources/META-INF/
Modified:
    incubator/tuscany/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java

Modified: incubator/tuscany/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java?rev=381016&r1=381015&r2=381016&view=diff
==============================================================================
--- incubator/tuscany/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java (original)
+++ incubator/tuscany/java/spec/sdo/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java Sat Feb 25 15:11:11 2006
@@ -30,17 +30,20 @@
 public class HelperProviderTestCase extends TestCase {
     private URL classes;
     private URL testClasses;
+    private URL def;
     private URL tccl1;
 
     public void testInstanceIsNullWithNoImplementation() throws Exception {
-        ClassLoader cl = new URLClassLoader(new URL[]{classes}, null);
-        Class<?> providerClass = cl.loadClass("commonj.sdo.impl.HelperProvider");
-        assertNull(providerClass.getField("INSTANCE").get(null));
+        assertNull(HelperProvider.INSTANCE);
     }
 
-    public void testDefaultInstance() {
-        assertNotNull(HelperProvider.INSTANCE);
-        assertEquals(DefaultHelperProvider.class, HelperProvider.INSTANCE.getClass());
+    public void testDefaultInstance() throws Exception {
+        ClassLoader cl = new URLClassLoader(new URL[]{classes, def, testClasses}, null);
+        Class<?> providerClass = cl.loadClass(HelperProvider.class.getName());
+        Class<?> implClass = cl.loadClass(DefaultHelperProvider.class.getName());
+        Object instance = providerClass.getField("INSTANCE").get(null);
+        assertNotNull(instance);
+        assertEquals(implClass, instance.getClass());
     }
 
     public void testLocateFromClassLoader() throws Exception {
@@ -83,5 +86,6 @@
         classes = new URL(HelperProvider.class.getResource("HelperProvider.class"), "../../..");
         testClasses = new URL(HelperProviderTestCase.class.getResource("HelperProviderTestCase.class"), "../../..");
         tccl1 = new URL(testClasses, "tccl1/");
+        def = new URL(testClasses, "default/");
     }
 }