[MMBASE SCM] r39779 - in mmbase/trunk/core/src/test: java/org/mmbase/util resources/org/mmbase/config/directory with spaces

[michiel]

Author: michiel
Date: 2009-11-18 17:42:16 +0100 (Wed, 18 Nov 2009)
New Revision: 39779

Added:
   mmbase/trunk/core/src/test/resources/org/mmbase/config/directory with 
spaces/INDEX
Modified:
   mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java
Log:
test-case was not correct

Modified: 
mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java
===================================================================
--- mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java     
2009-11-18 15:44:16 UTC (rev 39778)
+++ mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java     
2009-11-18 16:42:16 UTC (rev 39779)
@@ -95,16 +95,29 @@
 
 
     @Test
-    public void spaces() throws Exception {
+    public void spacesClassLoader() throws Exception {
         
assertNotNull(ResourceLoader.getConfigurationRoot().getDocument("directory with 
spaces/file with spaces.xml", false, null));
         
assertNotNull(ResourceLoader.getConfigurationRoot().getDocument("directory with 
spaces/file.xml", false, null));
         ResourceLoader child = 
ResourceLoader.getConfigurationRoot().getChildResourceLoader("directory with 
spaces");
         assertNotNull(child.getDocument("file.xml", false, null));
-        System.out.println(child.getResource("file.xml"));
         Set<String> xmls = child.getResourcePaths(ResourceLoader.XML_PATTERN, 
true);
-        assertEquals("" + child, 2, xmls.size()); // MMB-1894?
+        assertEquals("" + child, 2, xmls.size());
+    }
+
+
+    @Test
+    public void spacesFileLoader() throws Exception {
+        final String dir = "src/test/resources/org/mmbase/config/directory 
with spaces";
+        assertNotNull(ResourceLoader.getSystemRoot().getDocument(dir + "/file 
with spaces.xml", false, null));
+        assertNotNull(ResourceLoader.getSystemRoot().getDocument(dir + 
"/file.xml", false, null));
+
+        ResourceLoader child = 
ResourceLoader.getSystemRoot().getChildResourceLoader(dir);
+        Set<String> xmls = child.getResourcePaths(ResourceLoader.XML_PATTERN, 
true);
+        assertEquals("" + child, 2, xmls.size());
+        assertNotNull(child.getDocument("file.xml", false, null));
+        assertNotNull(child.getDocument("file with spaces.xml", false, null));
         for (String x : xmls) {
-            System.out.println(x);
+            assertNotNull(child.getDocument(x, false, null));
         }
 
 

Added: mmbase/trunk/core/src/test/resources/org/mmbase/config/directory with 
spaces/INDEX
===================================================================
--- mmbase/trunk/core/src/test/resources/org/mmbase/config/directory with 
spaces/INDEX                          (rev 0)
+++ mmbase/trunk/core/src/test/resources/org/mmbase/config/directory with 
spaces/INDEX  2009-11-18 16:42:16 UTC (rev 39779)
@@ -0,0 +1,2 @@
+file with spaces.xml
+file.xml

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs