[picocontainer-scm] [picocontainer] [3115] java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/xml: Use sensible default for system property "testcomp.jar".

Revision

3115

Author

joehni

Date

2006-12-12 07:59:47 -0600 (Tue, 12 Dec 2006)

Log Message

Use sensible default for system property "testcomp.jar".

Modified Paths

• java/nanocontainer/trunk/container/src/test/org/nanocontainer/reflection/DefaultNanoContainerTestCase.java
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java

Diff

Modified: java/nanocontainer/trunk/container/src/test/org/nanocontainer/reflection/DefaultNanoContainerTestCase.java (3114 => 3115)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/reflection/DefaultNanoContainerTestCase.java	2006-11-14 10:47:13 UTC (rev 3114)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/reflection/DefaultNanoContainerTestCase.java	2006-12-12 13:59:47 UTC (rev 3115)
@@ -90,13 +90,11 @@
 
     public void testChildContainerAdapterCanRelyOnParentContainerAdapter() throws MalformedURLException, ClassNotFoundException {
 
-        String testcompJarFileName = System.getProperty("testcomp.jar");
-
+        String testcompJarFileName = System.getProperty("testcomp.jar", "src/test-comp/TestComp.jar");
         // Paul's path to TestComp. PLEASE do not take out.
         //testcompJarFileName = "D:/OSS/PN/java/nanocontainer/src/test-comp/TestComp.jar";
-
-        assertNotNull("The testcomp.jar system property should point to java/nanocontainer/src/test-comp/TestComp.jar", testcompJarFileName);
         File testCompJar = new File(testcompJarFileName);
+        assertTrue("The testcomp.jar system property should point to java/nanocontainer/src/test-comp/TestComp.jar", testCompJar.isFile());
 
         // Set up parent
         NanoContainer parentContainer = new DefaultNanoContainer();
@@ -147,12 +145,11 @@
     public void testClassLoaderJugglingIsPossible() throws MalformedURLException, ClassNotFoundException {
         NanoContainer parentContainer = new DefaultNanoContainer();
 
-        String testcompJarFileName = System.getProperty("testcomp.jar");
+        String testcompJarFileName = System.getProperty("testcomp.jar", "src/test-comp/TestComp.jar");
         // Paul's path to TestComp. PLEASE do not take out.
         //testcompJarFileName = "D:/OSS/PN/java/nanocontainer/src/test-comp/TestComp.jar";
-        assertNotNull("The testcomp.jar system property should point to nano/reflection/src/test-comp/TestComp.jar", testcompJarFileName);
         File testCompJar = new File(testcompJarFileName);
-        assertTrue(testCompJar.isFile());
+        assertTrue("The testcomp.jar system property should point to java/nanocontainer/src/test-comp/TestComp.jar", testCompJar.isFile());
 
         parentContainer.registerComponentImplementation("foo", "org.nanocontainer.testmodel.DefaultWebServerConfig");
 

Modified: java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java (3114 => 3115)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java	2006-11-14 10:47:13 UTC (rev 3114)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java	2006-12-12 13:59:47 UTC (rev 3115)
@@ -142,10 +142,11 @@
     }
 
     public void testClassLoaderHierarchy() throws IOException {
-        String testcompJarFileName = System.getProperty("testcomp.jar");
-
-        assertNotNull("The testcomp.jar system property should point to nanocontainer/src/test-comp/TestComp.jar", testcompJarFileName);
+        String testcompJarFileName = System.getProperty("testcomp.jar", "src/test-comp/TestComp.jar");
+        // Paul's path to TestComp. PLEASE do not take out.
+        //testcompJarFileName = "D:/OSS/PN/java/nanocontainer/src/test-comp/TestComp.jar";
         File testCompJar = new File(testcompJarFileName);
+        assertTrue("The testcomp.jar system property should point to java/nanocontainer/src/test-comp/TestComp.jar", testCompJar.isFile());
         File testCompJar2 = new File(testCompJar.getParentFile(), "TestComp2.jar");
         File notStartableJar = new File(testCompJar.getParentFile(), "NotStartable.jar");
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email