Fix MethodSourceTests for JUnit 5.11.0

Author: dnestoro

.github/workflows/test-junit-platform-native.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17, 23 ]
         os: [ ubuntu-20.04 ]
     steps:
       - name: "☁️ Checkout repository"

common/junit-platform-native/src/test/java/org/graalvm/junit/jupiter/MethodSourceTests.java

@@ -78,12 +78,17 @@ protected static void addExpectedArgs(int a, int b) {
         protected static void traceArgs(int a, int b) {
             actualArgs.add(new int[]{a, b});
         }
+
+        protected static void clearPreviousExpectedArgs() {
+            expectedArgs.clear();
+        }
     }
 
     public static class EmptyMethodSourceTests extends ArgumentTestBase {
 
         @BeforeAll
         public static void setup() {
+            clearPreviousExpectedArgs();
             addExpectedArgs(1, 5);
             addExpectedArgs(7, 12);
         }
@@ -106,6 +111,7 @@ public static class SameClassMethodSourceTests extends ArgumentTestBase {
 
         @BeforeAll
         public static void setup() {
+            clearPreviousExpectedArgs();
             addExpectedArgs(31, 32);
             addExpectedArgs(1, 3);
         }
@@ -128,6 +134,7 @@ public static class OtherClassMethodSourceTests extends ArgumentTestBase {
 
         @BeforeAll
         public static void setup() {
+            clearPreviousExpectedArgs();
             addExpectedArgs(33, 35);
             addExpectedArgs(99, 1);
         }
@@ -143,6 +150,7 @@ public static class CombinedMethodSourceTests extends ArgumentTestBase {
 
         @BeforeAll
         public static void setup() {
+            clearPreviousExpectedArgs();
             addExpectedArgs(33, 35);
             addExpectedArgs(99, 1);
             addExpectedArgs(31, 32);

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java

@@ -219,7 +219,7 @@ private void runNativeTests(Path executable) throws MojoExecutionException {
             throw new MojoExecutionException("Failed creating xml output directory");
         }
 
-        Path testIdsLocation = outputDirectory.toPath().resolve("test-ids");
+        Path testIdsLocation = Path.of(NativeExtension.testIdsDirectory(outputDirectory.getAbsolutePath()));
         if (!testIdsLocation.toFile().exists()) {
             throw new MojoExecutionException("Test-ids not available under target/test-ids");
         }