diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17.java b/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNative.java similarity index 84% rename from quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17.java rename to quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNative.java index 7ac914538..0209d6f5c 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNative.java @@ -11,8 +11,8 @@ @Inherited @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) -@ExtendWith(DisabledOnFipsAndJava17Condition.class) -public @interface DisabledOnFipsAndJava17 { +@ExtendWith(DisabledOnFipsAndNativeCondition.class) +public @interface DisabledOnFipsAndNative { /** * Why is the annotated test class or test method disabled. */ diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17Condition.java b/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNativeCondition.java similarity index 62% rename from quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17Condition.java rename to quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNativeCondition.java index f9c5136c2..d4a9455e6 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndJava17Condition.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/scenarios/annotations/DisabledOnFipsAndNativeCondition.java @@ -1,31 +1,29 @@ package io.quarkus.test.scenarios.annotations; +import static io.quarkus.test.services.quarkus.model.QuarkusProperties.isNativeEnabled; + import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; import org.junit.jupiter.api.extension.ExtensionContext; -public class DisabledOnFipsAndJava17Condition implements ExecutionCondition { +public class DisabledOnFipsAndNativeCondition implements ExecutionCondition { /** * We set environment variable "FIPS" to "fips" in our Jenkins jobs when FIPS are enabled. */ private static final String FIPS_ENABLED = "fips"; - private static final int JAVA_17 = 17; @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { - if (isFipsEnabledEnvironment() && isJava17()) { - return ConditionEvaluationResult.disabled("The test is running in FIPS enabled environment with Java 17"); + if (isFipsEnabledEnvironment() && isNativeEnabled()) { + return ConditionEvaluationResult.disabled("The test is running in FIPS enabled environment in native mode"); } - return ConditionEvaluationResult.enabled("The test is not running in FIPS enabled environment with Java 17"); + return ConditionEvaluationResult.enabled("The test is not running in FIPS enabled environment in native mode"); } private static boolean isFipsEnabledEnvironment() { - return FIPS_ENABLED.equals(System.getenv().get("FIPS")); + return FIPS_ENABLED.equalsIgnoreCase(System.getenv().get("FIPS")); } - private static boolean isJava17() { - return JAVA_17 == Runtime.version().feature(); - } }