You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/03/11 08:35:09 UTC

git commit: improve support for symbolic links

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 8b7bc79d3 -> c0aec638b


improve support for symbolic links

Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/c0aec638
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/c0aec638
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/c0aec638

Branch: refs/heads/master
Commit: c0aec638b0a2a95476e7bb36d58b8dae4a280977
Parents: 8b7bc79
Author: Hervé Boutemy <hb...@apache.org>
Authored: Tue Mar 11 08:34:48 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Tue Mar 11 08:34:48 2014 +0100

----------------------------------------------------------------------
 .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java     | 4 ++--
 .../org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c0aec638/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
index b00aa5e..fbe664c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
@@ -47,7 +47,7 @@ public class MavenITmng3747PrefixedPathExpressionTest
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3747" );
 
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+        Verifier verifier = newVerifier( testDir.getCanonicalPath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.executeGoal( "validate" );
@@ -55,7 +55,7 @@ public class MavenITmng3747PrefixedPathExpressionTest
         verifier.resetStreams();
 
         Properties props = verifier.loadProperties( "target/config.properties" );
-        assertCanonicalFileEquals( "path is: " + new File( testDir, "relative" ).getAbsolutePath() + "/somepath", 
+        assertEquals( "path is: " + new File( testDir, "relative" ).getCanonicalPath() + "/somepath", 
             props.getProperty( "stringParam" ) );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c0aec638/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
index f8ac04f..d15c1c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
@@ -43,7 +43,7 @@ public class MavenITmng3760BaseUriPropertyTest
     public void testitMNG3760()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" ).getCanonicalFile();
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
@@ -55,7 +55,7 @@ public class MavenITmng3760BaseUriPropertyTest
 
         Properties props = verifier.loadProperties( "target/profile.properties" );
         // set via project
-        assertCanonicalFileEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
+        assertEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
         // check that project prefix is required
         assertEquals( "${baseUri}", props.getProperty( "project.properties.baseUriProperty" ) );
     }
@@ -77,7 +77,7 @@ public class MavenITmng3760BaseUriPropertyTest
 
         Properties props = verifier.loadProperties( "target/profile.properties" );
         // set via project
-        assertCanonicalFileEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
+        assertEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
         // check that project prefix is required
         assertEquals( "myBaseUri", props.getProperty( "project.properties.baseUriProperty" ) );
     }