svn commit: r1343229 - in /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2: impl/test/DefaultFileMonitorTests.java provider/url/test/UrlHttpProviderTestCase.java provider/url/test/UrlProviderTestCase.java

[ggregory]

Author: ggregory
Date: Mon May 28 12:50:20 2012
New Revision: 1343229

URL: http://svn.apache.org/viewvc?rev=1343229&view=rev
Log:
Tests do not correctly perform URL escaping.

Modified:
    
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
    
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
    
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java

Modified: 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java?rev=1343229&r1=1343228&r2=1343229&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTests.java
 Mon May 28 12:50:20 2012
@@ -64,7 +64,7 @@ public class DefaultFileMonitorTests ext
 
     public void testFileCreated() throws Exception
     {
-        FileObject fileObj = 
fsManager.resolveFile(testFile.toURL().toString());
+        FileObject fileObj = 
fsManager.resolveFile(testFile.toURI().toURL().toString());
         DefaultFileMonitor monitor = new DefaultFileMonitor(new 
TestFileListener());
         monitor.setDelay(100);
         monitor.addFile(fileObj);
@@ -79,7 +79,7 @@ public class DefaultFileMonitorTests ext
     public void testFileDeleted() throws Exception
     {
         writeToFile(testFile);
-        FileObject fileObj = 
fsManager.resolveFile(testFile.toURL().toString());
+        FileObject fileObj = 
fsManager.resolveFile(testFile.toURI().toString());
         DefaultFileMonitor monitor = new DefaultFileMonitor(new 
TestFileListener());
         monitor.setDelay(100);
         monitor.addFile(fileObj);
@@ -94,7 +94,7 @@ public class DefaultFileMonitorTests ext
     public void testFileModified() throws Exception
     {
         writeToFile(testFile);
-        FileObject fileObj = 
fsManager.resolveFile(testFile.toURL().toString());
+        FileObject fileObj = 
fsManager.resolveFile(testFile.toURI().toURL().toString());
         DefaultFileMonitor monitor = new DefaultFileMonitor(new 
TestFileListener());
         monitor.setDelay(100);
         monitor.addFile(fileObj);
@@ -114,7 +114,7 @@ public class DefaultFileMonitorTests ext
 
     public void testFileRecreated() throws Exception
     {
-        FileObject fileObj = 
fsManager.resolveFile(testFile.toURL().toString());
+        FileObject fileObj = 
fsManager.resolveFile(testFile.toURI().toURL().toString());
         DefaultFileMonitor monitor = new DefaultFileMonitor(new 
TestFileListener());
         monitor.setDelay(100);
         monitor.addFile(fileObj);

Modified: 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java?rev=1343229&r1=1343228&r2=1343229&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlHttpProviderTestCase.java
 Mon May 28 12:50:20 2012
@@ -58,7 +58,6 @@ public class UrlHttpProviderTestCase
         throws Exception
     {
         final File baseDir = AbstractVfsTestCase.getTestDirectory();
-        final URL url = baseDir.toURL();
-        return manager.resolveFile(url.toExternalForm());
+        return manager.resolveFile(baseDir.toURI().toURL().toExternalForm());
     }
 }

Modified: 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java?rev=1343229&r1=1343228&r2=1343229&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderTestCase.java
 Mon May 28 12:50:20 2012
@@ -58,7 +58,6 @@ public class UrlProviderTestCase
         throws Exception
     {
         final File baseDir = AbstractVfsTestCase.getTestDirectory();
-        final URL url = baseDir.toURL();
-        return manager.resolveFile(url.toExternalForm());
+        return manager.resolveFile(baseDir.toURI().toURL().toExternalForm());
     }
 }