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 2021/06/26 20:57:39 UTC
[maven] 01/03: [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 maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a9f337fd63963b2017c7b057234f9a9e3e78be46
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 comparing value
(System.getProperty( "user.dir" )) is not canonicalized.
This closes #361
---
.../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 b66abca..df10511 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
@@ -365,7 +365,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" ),