diff --git a/core/deployment/src/test/java/io/quarkus/deployment/CapabilityTest.java b/core/deployment/src/test/java/io/quarkus/deployment/CapabilityTest.java index 8ea50961f3f839..bc2e560a2aabdf 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/CapabilityTest.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/CapabilityTest.java @@ -1,18 +1,18 @@ package io.quarkus.deployment; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; public class CapabilityTest { - private static final String CAPABILITY_ILLEGAL_START = "Capability %s (%s) must start with '%s'."; - private static final String CAPABILITY_DOUBLE_DOT = "Capability %s (%s) contains subsequent dots."; - private static Stream capabilityFields() { Field[] declaredFields = Capability.class.getDeclaredFields(); return Stream.of(declaredFields) @@ -27,16 +27,8 @@ private static Stream capabilityFields() { void validateCapabilityString(Field field) { if (Modifier.isStatic(field.getModifiers()) && field.getType().equals(String.class)) { String value = getString(field); - if (!value.startsWith(Capability.QUARKUS_PREFIX + ".")) { - var failMessage = String.format(CAPABILITY_ILLEGAL_START, field.getName(), - value, Capability.QUARKUS_PREFIX); - fail(failMessage); - } - if (value.contains("..")) { - var failMessage = String.format(CAPABILITY_DOUBLE_DOT, field.getName(), - value); - fail(failMessage); - } + assertThat(value).startsWith(Capability.QUARKUS_PREFIX + "."); + assertThat(value).doesNotContain(".."); } }