svn commit: r806649 - /maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java

[jdcasey]

Author: jdcasey
Date: Fri Aug 21 17:13:00 2009
New Revision: 806649

URL: http://svn.apache.org/viewvc?rev=806649&view=rev
Log:
Correcting tests with broken escaping that had to do with blindly re-escaping 
pre-escaped values in one case, and to do with MSHARED-121 in another case.

Modified:
    
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java

Modified: 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java?rev=806649&r1=806648&r2=806649&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
 Fri Aug 21 17:13:00 2009
@@ -404,7 +404,7 @@
         mojo.execute();
 
         String resourcesDir = project.getOutputDirectory();
-        String checkString = "current working 
directory=c:\\\\\\\\org\\\\apache\\\\test";
+        String checkString = "current working 
directory=c:\\\\org\\\\apache\\\\test";
 
         assertContent( resourcesDir + "/file4.properties", checkString );
     }
@@ -627,11 +627,7 @@
 
         assertTrue( FileUtils.fileExists( new File( resourcesDir, 
"path-listing.txt" ).getAbsolutePath() ) );
 
-        // FIXME See http://jira.codehaus.org/browse/MSHARED-121
-//        assertEquals( "base path is C:\\\\Users\\\\Administrator\ndocuments 
path is C:\\\\Users\\\\Administrator\\\\Documents",
-//                      FileUtils.fileRead( new File( resourcesDir, 
"path-listing.txt" ) ) );
-        
-        assertEquals( "base path is C:\\\\Users\\\\Administrator\ndocuments 
path is C:\\\\Users\\\\Administrator\\Documents",
+        assertEquals( "base path is C:\\\\Users\\\\Administrator\ndocuments 
path is C:\\\\Users\\\\Administrator\\\\Documents",
                       FileUtils.fileRead( new File( resourcesDir, 
"path-listing.txt" ) ) );
     }