[MNG-8322] The EventSpy receives the new settings request/result

gnodet · Oct 17, 2024 · bce5684 · bce5684
1 parent 58dfa7d
commit bce5684
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
@@ -60,10 +60,16 @@ public void testit() throws Exception {
         assertTrue(lines.toString(), lines.get(lines.size() - 1).toString().startsWith("close"));
         assertTrue(
                 lines.toString(),
-                lines.contains("event: org.apache.maven.settings.building.DefaultSettingsBuildingRequest"));
+                lines.contains(
+                        matchesVersionRange("[4.0.0-beta-5,)")
+                                ? "event: org.apache.maven.api.services.SettingsBuilderRequest$SettingsBuilderRequestBuilder$DefaultSettingsBuilderRequest"
+                                : "event: org.apache.maven.settings.building.DefaultSettingsBuildingRequest"));
         assertTrue(
                 lines.toString(),
-                lines.contains("event: org.apache.maven.settings.building.DefaultSettingsBuildingResult"));
+                lines.contains(
+                        matchesVersionRange("[4.0.0-beta-5,)")
+                                ? "event: org.apache.maven.internal.impl.DefaultSettingsBuilder$DefaultSettingsBuilderResult"
+                                : "event: org.apache.maven.settings.building.DefaultSettingsBuildingResult"));
         assertTrue(lines.toString(), lines.contains("event: org.apache.maven.execution.DefaultMavenExecutionRequest"));
         assertTrue(lines.toString(), lines.contains("event: org.apache.maven.execution.DefaultMavenExecutionResult"));
         assertTrue(

diff --git a/...it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/...it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
@@ -58,9 +58,15 @@ public void testit() throws Exception {
         assertTrue(lines.toString(), lines.get(lines.size() - 1).startsWith("close"));
         assertTrue(
                 lines.toString(),
-                lines.contains("event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest"));
+                lines.contains(
+                        matchesVersionRange("[4.0.0-beta-5,)")
+                                ? "event: org.apache.maven.api.services.ToolchainsBuilderRequest$ToolchainsBuilderRequestBuilder$DefaultToolchainsBuilderRequest"
+                                : "event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest"));
         assertTrue(
                 lines.toString(),
-                lines.contains("event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingResult"));
+                lines.contains(
+                        matchesVersionRange("[4.0.0-beta-5,)")
+                                ? "event: org.apache.maven.internal.impl.DefaultToolchainsBuilder$DefaultToolchainsBuilderResult"
+                                : "event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingResult"));
     }
 }