svn commit: r643362 - /maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java

[hboutemy]

Author: hboutemy
Date: Tue Apr  1 04:14:38 2008
New Revision: 643362

URL: http://svn.apache.org/viewvc?rev=643362&view=rev
Log:
restore JDK 1.4 compatibility (URL.toURI API is 5+)

Modified:
    
maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java

Modified: 
maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java?rev=643362&r1=643361&r2=643362&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java
 Tue Apr  1 04:14:38 2008
@@ -24,10 +24,19 @@
 import org.apache.maven.plugin.MojoExecutionException;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 
 public class VerifierMojoTest
     extends TestCase
 {
+    private File getResourceFile( String name ) throws 
UnsupportedEncodingException
+    {
+        String file = getClass().getResource( name ).getFile();
+        String decode = URLDecoder.decode( file, "UTF-8" ); // necessary for 
JDK 1.5+, where spaces are escaped to %20
+        return new File( decode );
+    }
+
     public void testPrefixWithBaseDir()
     {
         VerifierMojo mojo = new VerifierMojo();
@@ -54,7 +63,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( "/FileDoesNotExist.xml" 
).toURI() );
+        File file = getResourceFile( "/FileDoesNotExist.xml" );
         mojo.setBaseDir( new File( "c:/some/path" ) );
         mojo.setVerificationFile( file );
         mojo.setFailOnError( true );
@@ -83,7 +92,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( "/File Exists.xml" 
).toURI() );
+        File file = getResourceFile( "/File Exists.xml" );
         mojo.setBaseDir( file.getParentFile() );
         mojo.setVerificationFile( file );
         mojo.setFailOnError( true );
@@ -104,7 +113,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( "/InexistentFile.xml" 
).toURI() );
+        File file = getResourceFile( "/InexistentFile.xml" );
         mojo.setBaseDir( new File( "c:/some/path" ) );
         mojo.setVerificationFile( file );
         mojo.setVerificationResultPrinter( new VerificationResultPrinter()
@@ -124,7 +133,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( 
"/InexistentFileThatExists.xml" ).toURI() );
+        File file = getResourceFile( "/InexistentFileThatExists.xml" );
         mojo.setBaseDir( file.getParentFile() );
         mojo.setVerificationFile( file );
         mojo.setFailOnError( true );
@@ -153,7 +162,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( 
"/FileExistsValidContent.xml" ).toURI() );
+        File file = getResourceFile( "/FileExistsValidContent.xml" );
         mojo.setBaseDir( file.getParentFile() );
         mojo.setVerificationFile( file );
         mojo.setVerificationResultPrinter( new VerificationResultPrinter()
@@ -173,7 +182,7 @@
         throws Exception
     {
         VerifierMojo mojo = new VerifierMojo();
-        File file = new File( getClass().getResource( 
"/FileExistsInvalidContent.xml" ).toURI() );
+        File file = getResourceFile( "/FileExistsInvalidContent.xml" );
         mojo.setBaseDir( file.getParentFile() );
         mojo.setVerificationFile( file );
         mojo.setFailOnError( true );