You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/06/10 07:58:28 UTC
[maven] 01/01: [MNG-6937] StringSearchModelInterpolatorTest fails
on symlinked paths
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6937
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c7f5f20e2709b09f5698fee56dd325c26ccb34a2
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jun 10 09:55:52 2020 +0200
[MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
Don't compare baseDir in a canonical form when the second comparator
(System.getProperty( "user.dir" )) is not canonicalized.
---
.../maven/model/interpolation/StringSearchModelInterpolatorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index 3672c20..dbb72c4 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -359,7 +359,7 @@ public class StringSearchModelInterpolatorTest
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
assertProblemFree( collector );
- assertThat( baseDir.getCanonicalPath(), is( System.getProperty( "user.dir" ) ) );
+ assertThat( baseDir.getAbsolutePath(), is( System.getProperty( "user.dir" ) ) );
assertThat( obj.values.size(), is( 1 ) );
assertThat( (String) obj.values.get( "key" ), is( anyOf(
is( System.getProperty( "user.dir" ) + File.separator + "target" ),