Author: olamy
Date: Thu Jun 9 22:02:00 2011
New Revision: 1134105
URL: http://svn.apache.org/viewvc?rev=1134105&view=rev
Log:
should fix issues with symlink on jenkins asf
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java?rev=1134105&r1=1134104&r2=1134105&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
Thu Jun 9 22:02:00 2011
@@ -19,7 +19,6 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
@@ -60,8 +59,10 @@ public class MavenITmng5011ConfigureColl
assertEquals( "0", props.getProperty( "stringParams" ) );
assertEquals( "2", props.getProperty( "fileParams" ) );
- assertEquals( new File( testDir, "foo" ), new File( props.getProperty(
"fileParams.0" ) ) );
- assertEquals( new File( testDir, "bar" ), new File( props.getProperty(
"fileParams.1" ) ) );
+ assertEquals( new File( testDir, "foo" ).getCanonicalFile(),
+ new File( props.getProperty( "fileParams.0" )
).getCanonicalFile() );
+ assertEquals( new File( testDir, "bar" ).getCanonicalFile(),
+ new File( props.getProperty( "fileParams.1" )
).getCanonicalFile() );
assertEquals( "5", props.getProperty( "listParam" ) );
assertEquals( "", props.getProperty( "listParam.0", "" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java?rev=1134105&r1=1134104&r2=1134105&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
Thu Jun 9 22:02:00 2011
@@ -19,7 +19,6 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
@@ -54,7 +53,8 @@ public class MavenITmng5012CollectionVsA
verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties"
);
- assertEquals( new File( testDir, "src/main/java" ), new File(
props.getProperty( "stringParams.0" ) ) );
+ assertEquals( new File( testDir, "src/main/java" ).getCanonicalFile(),
+ new File( props.getProperty( "stringParams.0" )
).getCanonicalFile() );
}
}