[picocontainer-scm] [picocontainer] [3149] java/nanocontainer/trunk/container/src/test/org/nanocontainer: Fixed failing tests

Revision

3149

Author

mauro

Date

2006-12-26 15:26:09 -0600 (Tue, 26 Dec 2006)

Log Message

Fixed failing tests

Modified Paths

• java/nanocontainer/trunk/container/src/test/org/nanocontainer/StandaloneTestCase.java
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/ScriptBuilderResolverTestCase.java

Added Paths

• java/nanocontainer/trunk/container/src/test/org/nanocontainer/include.xml
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer-with-include.xml
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer.xml

Removed Paths

• java/nanocontainer/trunk/container/src/test/org/nanocontainer/standalone_test.xml
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/subone.xml

Diff

Modified: java/nanocontainer/trunk/container/src/test/org/nanocontainer/StandaloneTestCase.java (3148 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/StandaloneTestCase.java	2006-12-26 12:00:47 UTC (rev 3148)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/StandaloneTestCase.java	2006-12-26 21:26:09 UTC (rev 3149)
@@ -35,7 +35,7 @@
     public void testShouldBeAbleToInvokeMainMethodWithScriptFromClasspathWithXmlIncludes() throws IOException, ClassNotFoundException {
         Standalone.main(new String[] {
             "-r",
-            "/org/nanocontainer/standalone_test.xml", //I don't see this in the code base?? -MR
+            "/org/nanocontainer/nanocontainer-with-include.xml", 
             "-n"
         });
     }
@@ -46,7 +46,7 @@
         URL classURL = Standalone.class.getResource(relativeClassPath);
         String absoluteClassPath = classURL.getFile();
         File absoluteDirPath = new File(absoluteClassPath).getParentFile();
-        File absoluteScriptPath = new File(absoluteDirPath, "nanocontainer.groovy");
+        File absoluteScriptPath = new File(absoluteDirPath, "nanocontainer.xml");
         return absoluteScriptPath;
     }
 

Copied: java/nanocontainer/trunk/container/src/test/org/nanocontainer/include.xml (from rev 3147, java/nanocontainer/trunk/container/src/test/org/nanocontainer/subone.xml) (0 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/include.xml	                        (rev 0)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/include.xml	2006-12-26 21:26:09 UTC (rev 3149)
@@ -0,0 +1,3 @@
+<container>
+    <component class="java.util.ArrayList"/>
+</container>
\ No newline at end of file

Copied: java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer-with-include.xml (from rev 3147, java/nanocontainer/trunk/container/src/test/org/nanocontainer/standalone_test.xml) (0 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer-with-include.xml	                        (rev 0)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer-with-include.xml	2006-12-26 21:26:09 UTC (rev 3149)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE container [
+<!ENTITY include SYSTEM "include.xml">
+]>
+
+<container>
+    &include;
+</container>
\ No newline at end of file

Added: java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer.xml (0 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer.xml	                        (rev 0)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/nanocontainer.xml	2006-12-26 21:26:09 UTC (rev 3149)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<container>
+    <container>
+        <component class="java.util.ArrayList" />
+    </container>
+</container>
\ No newline at end of file

Modified: java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/ScriptBuilderResolverTestCase.java (3148 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/ScriptBuilderResolverTestCase.java	2006-12-26 12:00:47 UTC (rev 3148)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/ScriptBuilderResolverTestCase.java	2006-12-26 21:26:09 UTC (rev 3149)
@@ -29,10 +29,6 @@
     public void testGetAllSupportedExtensions() {
         Set allExtensions = new TreeSet();
 
-        allExtensions.add(ScriptBuilderResolver.BEANSHELL);
-        allExtensions.add(ScriptBuilderResolver.GROOVY);
-        allExtensions.add(ScriptBuilderResolver._javascript_);
-        allExtensions.add(ScriptBuilderResolver.JYTHON);
         allExtensions.add(ScriptBuilderResolver.XML);
 
         String[] actualReturn = scriptBuilderResolver.getAllSupportedExtensions();
@@ -42,23 +38,30 @@
         boolean someMerged = allExtensions.removeAll(returnAsList);
         assertTrue(someMerged);
         assertTrue(allExtensions.size() == 0);
-
     }
 
     public void testGetBuilderClassNameForFile() {
+        File compositionFile = new File("test.xml");
+        String expected = ScriptBuilderResolver.DEFAULT_XML_BUILDER;
+        String actual = scriptBuilderResolver.getBuilderClassName(compositionFile);
+        assertEquals("return value", expected, actual);
+    }
 
-        File compositionFile = new File("test.groovy");
-        String expectedReturn = ScriptBuilderResolver.DEFAULT_GROOVY_BUILDER;
-        String actualReturn = scriptBuilderResolver.getBuilderClassName(compositionFile);
-        assertEquals("return value", expectedReturn, actualReturn);
+    public void testGetBuilderClassNameForResource() {
+        final String resourceName = "/org/nanocontainer/nanocontainer.xml";
+        URL compositionURL = this.getClass().getResource(resourceName);
+        if (compositionURL == null) {
+            fail("This test depended on resource '"+ resourceName + "' which appears to have been moved");
+        }
+        String expected = ScriptBuilderResolver.DEFAULT_XML_BUILDER;
+        String actual = scriptBuilderResolver.getBuilderClassName(compositionURL);
+        assertEquals("return value", expected, actual);
     }
 
-
     public void testGetBuilderClassNameForExtension() throws UnsupportedScriptTypeException {
-        String expectedReturn = ScriptBuilderResolver.DEFAULT_JAVASCRIPT_BUILDER;
-        String actualReturn = scriptBuilderResolver.getBuilderClassName(".js");
+        String expectedReturn = ScriptBuilderResolver.DEFAULT_XML_BUILDER;
+        String actualReturn = scriptBuilderResolver.getBuilderClassName(".xml");
         assertEquals("return value", expectedReturn, actualReturn);
-
     }
 
     public void testGetBuilderForExtensionThrowsExceptionForUnknownBuilderType() {
@@ -68,20 +71,8 @@
         } catch (UnsupportedScriptTypeException ex) {
             assertEquals(".foo",ex.getRequestedExtension());
         }
-
     }
 
-    public void testGetBuilderClassName2() {
-        final String resourceName = "/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy";
-        URL compositionURL = this.getClass().getResource(resourceName);
-        if (compositionURL == null) {
-            fail("This test depended on resource '"+ resourceName + "' which appears to have been moved");
-        }
-        String expectedReturn = ScriptBuilderResolver.DEFAULT_GROOVY_BUILDER;
-        String actualReturn = scriptBuilderResolver.getBuilderClassName(compositionURL);
-        assertEquals("return value", expectedReturn, actualReturn);
-    }
-
     public void testRegisterBuilder() {
         scriptBuilderResolver.registerBuilder(".foo","org.example.FooBar");
         assertEquals("org.example.FooBar", scriptBuilderResolver.getBuilderClassName(".foo"));

Deleted: java/nanocontainer/trunk/container/src/test/org/nanocontainer/standalone_test.xml (3148 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/standalone_test.xml	2006-12-26 12:00:47 UTC (rev 3148)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/standalone_test.xml	2006-12-26 21:26:09 UTC (rev 3149)
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE container [
-<!ENTITY subone SYSTEM "subone.xml">
-]>
-
-<container>
-    &subone;
-</container>
\ No newline at end of file

Deleted: java/nanocontainer/trunk/container/src/test/org/nanocontainer/subone.xml (3148 => 3149)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/subone.xml	2006-12-26 12:00:47 UTC (rev 3148)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/subone.xml	2006-12-26 21:26:09 UTC (rev 3149)
@@ -1,3 +0,0 @@
-<container>
-    <component class="java.util.ArrayList"/>
-</container>
\ No newline at end of file

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email