[MMBASE SCM] r39782 - mmbase/trunk/core/src/test/java/org/mmbase/util

[michiel]

Author: michiel
Date: 2009-11-18 18:43:36 +0100 (Wed, 18 Nov 2009)
New Revision: 39782

Modified:
   mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java
Log:
simpler test

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 17:43:08 UTC (rev 39781)
+++ mmbase/trunk/core/src/test/java/org/mmbase/util/ResourceLoaderTest.java     
2009-11-18 17:43:36 UTC (rev 39782)
@@ -108,11 +108,14 @@
 
     @Test
     public void spacesFileLoader() throws Exception {
+        ResourceLoader fileLoader = new ResourceLoader();
+        fileLoader.roots.add(fileLoader.new FileURLStreamHandler(new 
File(System.getProperty("user.dir")), true));
+
         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));
+        assertNotNull(fileLoader.getDocument(dir + "/file with spaces.xml", 
false, null));
+        assertNotNull(fileLoader.getDocument(dir + "/file.xml", false, null));
 
-        ResourceLoader child = 
ResourceLoader.getSystemRoot().getChildResourceLoader(dir);
+        ResourceLoader child = fileLoader.getChildResourceLoader(dir);
         Set<String> xmls = child.getResourcePaths(ResourceLoader.XML_PATTERN, 
true);
         assertEquals("" + child, 2, xmls.size());
         assertNotNull(child.getDocument("file.xml", false, null));
@@ -121,7 +124,7 @@
             assertNotNull(child.getDocument(x, false, null));
         }
         List<URL> resources = child.getResourceList("file with spaces.xml");
-        assertEquals(2, resources.size());
+        assertEquals(1, resources.size());
         for (URL u : resources) {
             assertEquals(new File(u.toURI()).exists(), 
u.openConnection().getDoInput()); // MMB-1894
         }

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