[maven] branch master updated: [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new ef8c95e  [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
ef8c95e is described below

commit ef8c95eb397651e10f677763dfcd9c8cea7c27b0
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 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" ),