Merge pull request #32883 from zakkak/2023-04-25-fix-gradle-latest-graal

Drop condition for GraalVM < 22.2
quarkusio · Apr 26, 2023 · 4ef3303 · 4ef3303
2 parents 57ff544 + e9d26a7
commit 4ef3303
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/...tion-tests/gradle/src/test/java/io/quarkus/gradle/nativeimage/BasicJavaNativeBuildIT.java b/...tion-tests/gradle/src/test/java/io/quarkus/gradle/nativeimage/BasicJavaNativeBuildIT.java
@@ -24,13 +24,8 @@ public void shouldBuildNativeImage() throws Exception {
         assertThat(build.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
         final String buildOutput = build.getOutput();
         // make sure the output log during the build contains some expected logs from the native-image process
-        CharSequence[] expectedOutput;
-        if (buildOutput.contains("Version info:")) { // Starting with 22.0 the native-image output changed
-            expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
-                    "Finished generating '" + NATIVE_IMAGE_NAME + "' in" };
-        } else {
-            expectedOutput = new CharSequence[] { "(clinit):", "(typeflow):", "[total]:" };
-        }
+        CharSequence[] expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
+                "Finished generating '" + NATIVE_IMAGE_NAME + "' in" };
         assertThat(buildOutput)
                 .withFailMessage("native-image build log is missing certain expected log messages: \n\n %s", buildOutput)
                 .contains(expectedOutput);
@@ -58,13 +53,8 @@ public void shouldBuildNativeImageWithCustomName() throws Exception {
         assertThat(build.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
         final String buildOutput = build.getOutput();
         // make sure the output log during the build contains some expected logs from the native-image process
-        CharSequence[] expectedOutput;
-        if (buildOutput.contains("Version info:")) { // Starting with 22.0 the native-image output changed
-            expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
-                    "Finished generating 'test-runner' in" };
-        } else {
-            expectedOutput = new CharSequence[] { "(clinit):", "(typeflow):", "[total]:" };
-        }
+        CharSequence[] expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
+                "Finished generating 'test-runner' in" };
         assertThat(buildOutput)
                 .withFailMessage("native-image build log is missing certain expected log messages: \n\n %s", buildOutput)
                 .contains(expectedOutput)
@@ -93,13 +83,8 @@ public void shouldBuildNativeImageWithCustomNameWithoutSuffix() throws Exception
         assertThat(build.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
         final String buildOutput = build.getOutput();
         // make sure the output log during the build contains some expected logs from the native-image process
-        CharSequence[] expectedOutput;
-        if (buildOutput.contains("Version info:")) { // Starting with 22.0 the native-image output changed
-            expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
-                    "Finished generating 'test' in" };
-        } else {
-            expectedOutput = new CharSequence[] { "(clinit):", "(typeflow):", "[total]:" };
-        }
+        CharSequence[] expectedOutput = new CharSequence[] { "Initializing...", "Performing analysis...",
+                "Finished generating 'test' in" };
         assertThat(buildOutput)
                 .withFailMessage("native-image build log is missing certain expected log messages: \n\n %s", buildOutput)
                 .contains(expectedOutput)