Handle equivalent temporary path aliases in Maven tests

Author: jormundur00

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy

@@ -82,8 +82,9 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio
 
         and:
         // Instrumented execution output reports the Maven-managed agent output directory. §FS-tracing-agent.3.
-        outputContains "Instrumenting Maven test execution with the native-image-agent. Agent output: " +
-                file('target/native/agent-output/test').canonicalPath
+        outputContainsAbsoluteOrCanonicalPath(
+                "Instrumenting Maven test execution with the native-image-agent. Agent output: ",
+                file('target/native/agent-output/test'))
 
         and:
         // Agent generates files
@@ -128,8 +129,9 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio
 
         and:
         // Instrumented execution output reports the Maven-managed agent output directory. §FS-tracing-agent.3.
-        outputContains "Instrumenting Maven application execution with the native-image-agent. Agent output: " +
-                file('target/native/agent-output/main').canonicalPath
+        outputContainsAbsoluteOrCanonicalPath(
+                "Instrumenting Maven application execution with the native-image-agent. Agent output: ",
+                file('target/native/agent-output/main'))
 
         when:
         mvn'-Pnative', '-DquickBuild', '-DskipNativeTests', '-Dagent=true', 'native:metadata-copy'

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy

@@ -68,8 +68,9 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         buildSucceeded
         outputContains "Hello, from reflection!"
         // Maven output identifies the selected metadata repository source. §FS-resources-and-metadata.2.
-        outputContains "Using GraalVM reachability metadata repository from " +
-                file("config-directory").canonicalFile.toURI().toASCIIString()
+        outputContainsAbsoluteOrCanonicalUri(
+                "Using GraalVM reachability metadata repository from ",
+                file("config-directory"))
 
         and: "it doesn't find a configuration directory for the current version"
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
@@ -125,8 +126,9 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         buildSucceeded
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration is forced to version 2"
         // Maven output identifies the selected metadata repository source. §FS-resources-and-metadata.2.
-        outputContains "Using GraalVM reachability metadata repository from " +
-                file("config-directory").canonicalFile.toURI().toASCIIString()
+        outputContainsAbsoluteOrCanonicalUri(
+                "Using GraalVM reachability metadata repository from ",
+                file("config-directory"))
         outputContains "Reflection failed"
     }
 
@@ -141,8 +143,9 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         buildSucceeded
         outputContains "Hello, from reflection!"
         // Maven output identifies the selected metadata repository source. §FS-resources-and-metadata.2.
-        outputContains "Using GraalVM reachability metadata repository from " +
-                file("target/repo.zip").canonicalFile.toURI().toASCIIString()
+        outputContainsAbsoluteOrCanonicalUri(
+                "Using GraalVM reachability metadata repository from ",
+                file("target/repo.zip"))
 
         and: "it doesn't find a configuration directory for the current version"
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."

native-maven-plugin/src/testFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy

@@ -218,6 +218,18 @@ abstract class AbstractGraalVMMavenFunctionalTest extends Specification {
         normalizeString(result.stdOut).contains(normalizeString(text))
     }
 
+    // Temp directories can be reported through equivalent aliases (macOS symlinks or Windows 8.3 paths).
+    // §E2E-functional-tests.3.5 §E2E-functional-tests.3.6
+    boolean outputContainsAbsoluteOrCanonicalPath(String prefix, File location) {
+        [location.absolutePath, location.canonicalPath].any { path -> outputContains(prefix + path) }
+    }
+
+    boolean outputContainsAbsoluteOrCanonicalUri(String prefix, File location) {
+        [location.absoluteFile, location.canonicalFile]
+                .collect { file -> file.toURI().toASCIIString() }
+                .any { uri -> outputContains(prefix + uri) }
+    }
+
     boolean outputContainsPattern(String pattern) {
         def normalizedOutput = normalizeString(result.stdOut)
         def lines = normalizedOutput.split('\n')