You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/22 23:36:14 UTC

svn commit: r678916 - /maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java

Author: jdcasey
Date: Tue Jul 22 14:36:13 2008
New Revision: 678916

URL: http://svn.apache.org/viewvc?rev=678916&view=rev
Log:
still trying to fix test for windows.

Modified:
    maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java

Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java?rev=678916&r1=678915&r2=678916&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java Tue Jul 22 14:36:13 2008
@@ -337,8 +337,12 @@
         File basedir = new File( System.getProperty( "java.io.tmpdir" ), "base" );
         
         String value = interpolator.interpolate( "${project.build.outputDirectory}/foo", model, basedir, new DefaultProjectBuilderConfiguration(), true );
+        value = value.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
         
-        assertEquals( value, new File( basedir, "target/classes/foo" ).getAbsolutePath().replace( '/', File.separatorChar ).replace( '\\', File.separatorChar ) );
+        String check = new File( basedir, "target/classes/foo" ).getAbsolutePath();
+        check = check.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
+        
+        assertEquals( check, value );
     }
 
 //    public void testPOMExpressionDoesNotUseSystemProperty()