From a9f337fd63963b2017c7b057234f9a9e3e78be46 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Wed, 10 Jun 2020 09:55:52 +0200 Subject: [PATCH] [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 --- .../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 b66abcade2a9..df10511cee2b 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 void testInterpolateObjectWithPomFile() 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" ),