Repository: maven-integration-testing Updated Branches: refs/heads/master 9f11d8d70 -> b79791ee7
fix ITs when current path contains a Unix symbolic link (failures reproduced on ASF Jenkins https://builds.apache.org/job/core-integration-testing-maven-3-embedded) 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/b79791ee Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b79791ee Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b79791ee Branch: refs/heads/master Commit: b79791ee7dfc7c1f943ed03ded2875e1b5073503 Parents: 9f11d8d Author: Hervé Boutemy <hbout...@apache.org> Authored: Sun Mar 9 20:43:44 2014 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sun Mar 9 20:43:44 2014 +0100 ---------------------------------------------------------------------- .../maven/it/MavenITmng2201PluginConfigInterpolationTest.java | 2 +- .../org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java | 2 +- .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 2 +- .../org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 4 ++-- .../java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java | 2 +- .../apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java | 2 +- .../apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java | 2 +- .../maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java | 2 +- .../apache/maven/it/MavenITmng3944BasedirInterpolationTest.java | 4 ++-- .../org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index 39e5585..13ba7ed 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -53,7 +53,7 @@ public class MavenITmng2201PluginConfigInterpolationTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( "target/config.properties" ); assertEquals( new File( testDir, "target" ), new File( props.getProperty( "stringParam" ) ) ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index 0baebdf..f3a4e6c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -56,7 +56,7 @@ public class MavenITmng3475BaseAlignedDirTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties configProps = verifier.loadProperties( "target/config.properties" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/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 dea9ae0..62fb2ad 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 @@ -54,7 +54,7 @@ public class MavenITmng3747PrefixedPathExpressionTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( "target/config.properties" ); assertEquals( "path is: " + new File( testDir, "relative" ).getAbsolutePath() + "/somepath", http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/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 61c36f2..2251367 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 @@ -53,7 +53,7 @@ public class MavenITmng3760BaseUriPropertyTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( "target/profile.properties" ); // set via project @@ -77,7 +77,7 @@ public class MavenITmng3760BaseUriPropertyTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( "target/profile.properties" ); // set via project http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index aa17254..7bfe441 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -57,7 +57,7 @@ public class MavenITmng3827PluginConfigTest Properties props = verifier.loadProperties( "target/plugin-config.properties" ); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); assertEquals( new File( testDir, "pom.xml" ), new File( props.getProperty( "fileParam" ) ) ); assertEquals( "true", props.getProperty( "booleanParam" ) ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index 8898a39..feb1df6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -57,7 +57,7 @@ public class MavenITmng3864PerExecPluginConfigTest Properties props = verifier.loadProperties( "target/plugin-config.properties" ); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); assertEquals( new File( testDir, "pom.xml" ), new File( props.getProperty( "fileParam" ) ) ); assertEquals( "true", props.getProperty( "booleanParam" ) ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index 925a55f..4650294 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -55,7 +55,7 @@ public class MavenITmng3877BasedirAlignedModelTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties modelProps = verifier.loadProperties( "target/model.properties" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index 0551c62..52d0936 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -56,7 +56,7 @@ public class MavenITmng3904NestedBuildDirInterpolationTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); Properties props = verifier.loadProperties( "target/pom.properties" ); assertEquals( new File( testDir, "target/classes/dir0" ), http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index c50db1a..74494b6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -58,8 +58,8 @@ public class MavenITmng3944BasedirInterpolationTest verifier.assertFilePresent( "target/basedir.properties" ); Properties props = verifier.loadProperties( "target/basedir.properties" ); - assertEquals( testDir.getCanonicalFile(), new File( props.getProperty( "project.properties.prop0" ) ) ); - assertEquals( testDir.getCanonicalFile(), new File( props.getProperty( "project.properties.prop1" ) ) ); + assertEquals( testDir, new File( props.getProperty( "project.properties.prop0" ) ) ); + assertEquals( testDir, new File( props.getProperty( "project.properties.prop1" ) ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index a751255..4cfac28 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -70,7 +70,7 @@ public class MavenITmng3951AbsolutePathsTest verifier.assertFilePresent( "target/path.properties" ); Properties props = verifier.loadProperties( "target/path.properties" ); - testDir = testDir.getCanonicalFile(); + //testDir = testDir.getCanonicalFile(); assertEquals( new File( testDir, "tmp" ).getAbsoluteFile(), new File( props.getProperty( "fileParams.0" ) ) ); assertEquals( new File( getRoot( testDir ), "tmp" ).getAbsoluteFile(), new File( props.getProperty( "fileParams.1" ) ) );
