From 9aa87d9f461172725409771b52315a9d0c434fd9 Mon Sep 17 00:00:00 2001 From: Daniel Berecz Date: Mon, 9 Sep 2024 11:40:29 +0200 Subject: [PATCH] Added isRHBQ method to check if the version contains string redhat --- .../io/quarkus/ts/buildtimeanalytics/AbstractAnalyticsIT.java | 3 +-- .../streams/DisabledOnRHBQAarch64NativeConditions.java | 2 +- .../reactive/streams/DisabledOnRHBQWindowsConditions.java | 2 +- .../io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java | 2 +- .../ts/quarkus/cli/update/AbstractQuarkusCliUpdateIT.java | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/AbstractAnalyticsIT.java b/build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/AbstractAnalyticsIT.java index a8cb424cf..562b2283e 100644 --- a/build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/AbstractAnalyticsIT.java +++ b/build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/AbstractAnalyticsIT.java @@ -143,8 +143,7 @@ private void validateExtensions(QuarkusCliRestService app, JsonPath json) { assertEquals(pomDependencyGAs, payloadExtensionGAs); // RHBQ doesn't guarantee the same version of the platform and core extensions - boolean isRHBQ = QuarkusProperties.getVersion().contains("redhat"); - if (!isRHBQ) { + if (!QuarkusProperties.isRHBQ()) { List extensionsWithMismatchedVersion = payloadExtensions.stream() .filter(extension -> !QUARKUS_EXTENSION_VERSION_PATTERN.matcher(extension.getVersion()).matches()) .collect(Collectors.toList()); diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java index 0c4199cbd..aa53c6e65 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java @@ -10,7 +10,7 @@ public class DisabledOnRHBQAarch64NativeConditions implements ExecutionCondition @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) { - boolean isRHBQ = QuarkusProperties.getVersion().contains("redhat"); + boolean isRHBQ = QuarkusProperties.isRHBQ(); boolean isNative = QuarkusProperties.isNativeEnabled(); boolean isAarch64 = "true".equals(System.getProperty("ts.arm.missing.services.excludes")); if (isRHBQ && isAarch64 && isNative) { diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQWindowsConditions.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQWindowsConditions.java index 3f0530840..862de2466 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQWindowsConditions.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQWindowsConditions.java @@ -11,7 +11,7 @@ public class DisabledOnRHBQWindowsConditions implements ExecutionCondition { @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) { - boolean isRHBQ = QuarkusProperties.getVersion().contains("redhat"); + boolean isRHBQ = QuarkusProperties.isRHBQ(); boolean isWindows = OS.current().equals(OS.WINDOWS); if (isRHBQ && isWindows) { return ConditionEvaluationResult.disabled("It is RHBQ on Windows"); diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java index f5f02de2e..dc81387ee 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java @@ -88,7 +88,7 @@ public void shouldListExtensionsUsingPlatformBom() { public void shouldListExtensionsUsingStream() { var req = ListExtensionRequest.withSetStream(); result = cliClient.listExtensions(req, "--origins"); - if (QuarkusProperties.getVersion().contains("redhat")) { + if (QuarkusProperties.isRHBQ()) { assertTrue(result.getOutput().contains("com.redhat.quarkus.platform:quarkus-bom:" + req.stream())); } else { assertTrue(result.getOutput().contains("io.quarkus.platform:quarkus-bom:" + req.stream())); diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/update/AbstractQuarkusCliUpdateIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/update/AbstractQuarkusCliUpdateIT.java index ab9f20cc5..954491ee6 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/update/AbstractQuarkusCliUpdateIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/update/AbstractQuarkusCliUpdateIT.java @@ -49,7 +49,7 @@ public AbstractQuarkusCliUpdateIT(DefaultArtifactVersion oldVersionStream, Defau } protected IQuarkusCLIAppManager createAppManager() { - if (this.newVersionFromProperties != null && this.newVersionFromProperties.contains("redhat")) { + if (this.newVersionFromProperties != null && QuarkusProperties.isRHBQ()) { return new RHBQPlatformAppManager(cliClient, oldVersionStream, newVersionStream, new DefaultArtifactVersion(newVersionFromProperties)); } @@ -71,7 +71,7 @@ public void versionUpdateTest() throws IOException, XmlPullParserException { assertEquals(newVersionStream.getMinorVersion(), updatedVersion.getMinorVersion(), "Minor version for app updated to " + newVersionStream + " should be " + newVersionStream.getMinorVersion()); // check that updated app is using RHBQ, if we're testing with RHBQ - if (QuarkusProperties.getVersion().contains("redhat")) { + if (QuarkusProperties.isRHBQ()) { assertTrue(updatedVersion.toString().contains("redhat"), "Updated app is not using \"redhat\" version. Found version: " + updatedVersion); }