From 847e0570af3139d2308b24a37eafce0353877d07 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Tue, 29 Oct 2019 21:40:27 +0100 Subject: [PATCH] Rename @SubstrateTest to @NativeImageTest --- .../deployment/test/TestScopeSetup.java | 4 +- .../resources/gradle-project/build.gradle | 2 +- .../create-extension-templates/IT.java | 4 +- .../java/native-test-resource-template.ftl | 4 +- .../kotlin/native-test-resource-template.ftl | 4 +- .../scala/native-test-resource-template.ftl | 4 +- .../asciidoc/building-native-image-guide.adoc | 6 +-- .../asciidoc/getting-started-testing.adoc | 2 +- docs/src/main/asciidoc/maven-tooling.adoc | 2 +- .../ArcTestRequestScopeProvider.java | 8 ++-- .../dynamodb/DynamoDbFunctionalityITCase.java | 4 +- .../amazon/lambda/AmazonLambdaSimpleIT.java | 4 +- .../amazon/lambda/AmazonLambdaSimpleIT.java | 4 +- .../it/artemis/ArtemisConsumerITCase.java | 4 +- .../it/artemis/ArtemisProducerITCase.java | 4 +- .../it/artemis/ArtemisConsumerITCase.java | 4 +- .../it/artemis/ArtemisProducerITCase.java | 4 +- .../it/resteasy/elytron/BaseAuthIT.java | 4 +- .../jdbc/it/ElytronSecurityJdbcIT.java | 4 +- .../ElytronOauth2ExtensionResourceITCase.java | 4 +- .../java/io/quarkus/it/elytron/JCAITCase.java | 4 +- .../it/elytron/X500PrincipalUtilITCase.java | 4 +- .../it/undertow/elytron/BaseAuthIT.java | 4 +- .../flyway/FlywayFunctionalityNativeIT.java | 4 +- .../PanacheFunctionalityInGraalITCase.java | 4 +- .../it/panache/PanacheFunctionalityTest.java | 4 +- .../ElasticsearchClientInGraalIT.java | 4 +- .../HibernateSearchInGraalIT.java | 4 +- ...teValidatorFunctionalityInGraalITCase.java | 4 +- ...panCacheJPAFunctionalityInGraalITCase.java | 4 +- ...ispanClientFunctionalityInGraalITCase.java | 4 +- ...panEmbeddedFunctionalityInGraalITCase.java | 4 +- .../InheritedModelWithBuilderResourceIT.java | 4 +- .../ModelWithBuilderResourceIT.java | 4 +- ...lizerAndDeserializerOnFieldResourceIT.java | 4 +- .../RegisteredPojoModelResourceIT.java | 4 +- .../java/io/quarkus/it/jgit/NativeJGitIT.java | 4 +- .../derby/JPAFunctionalityInGraalITCase.java | 4 +- .../jpa/h2/JPAFunctionalityInGraalITCase.java | 4 +- .../JPAFunctionalityInGraalITCase.java | 4 +- .../mssql/JPAFunctionalityInGraalITCase.java | 4 +- .../mysql/JPAFunctionalityInGraalITCase.java | 4 +- .../JPAFunctionalityInGraalITCase.java | 4 +- .../JPAReflectionInGraalITCase.java | 4 +- ...JPAConfigurationlessTestInGraalITCase.java | 4 +- .../JPAElementCollectionInGraalITCase.java | 4 +- .../JPALoadScriptTestInGraalITCase.java | 4 +- ...lizerAndDeserializerOnFieldResourceIT.java | 4 +- .../quarkus/it/kafka/KafkaConsumerITCase.java | 4 +- .../quarkus/it/kafka/KafkaProducerITCase.java | 4 +- .../it/kafka/streams/KafkaStreamsITCase.java | 4 +- .../keycloak/PolicyEnforcerInGraalITCase.java | 4 +- .../acme/kogito/PersonProcessInGraalIT.java | 4 +- .../it/kogito/drools/DroolsTestIT.java | 4 +- .../it/kogito/jbpm/OrdersProcessTestIT.java | 4 +- .../client/KubernetesClientTestIT.java | 4 +- .../it/main/CharacterSetSupportITCase.java | 4 +- .../it/main/ConfigPropertiesITCase.java | 4 +- .../it/main/ContextPropagationITCase.java | 4 +- .../it/main/CoreReflectionInGraalITCase.java | 4 +- .../it/main/CustomConfigSourceITCase.java | 4 +- .../it/main/DataSourceTransactionITCase.java | 4 +- .../io/quarkus/it/main/DatasourceITCase.java | 4 +- .../quarkus/it/main/ExternalIndexITCase.java | 4 +- .../quarkus/it/main/FaultToleranceITCase.java | 4 +- .../quarkus/it/main/HealthCheckTestCase.java | 2 + .../java/io/quarkus/it/main/HealthITCase.java | 4 +- .../quarkus/it/main/JPABootstrapITCase.java | 4 +- .../it/main/JPAReflectionInGraalITCase.java | 4 +- .../io/quarkus/it/main/JPAUserTypeITCase.java | 4 +- .../java/io/quarkus/it/main/JaxRSITCase.java | 4 +- .../java/io/quarkus/it/main/JaxbITCase.java | 4 +- .../io/quarkus/it/main/MetricsITCase.java | 4 +- .../it/main/MetricsInheritanceITCase.java | 4 +- .../quarkus/it/main/MetricsOnClassITCase.java | 4 +- .../it/main/MicroProfileConfigITCase.java | 4 +- .../io/quarkus/it/main/OpenApiITCase.java | 4 +- .../io/quarkus/it/main/OpenTracingITCase.java | 4 +- .../quarkus/it/main/ProfileManagerITCase.java | 4 +- .../it/main/RBACAccessInGraalITCase.java | 4 +- .../main/ReactiveStreamsOperatorsITCase.java | 4 +- .../quarkus/it/main/RequestScopeITCase.java | 4 +- .../io/quarkus/it/main/RestClientITCase.java | 4 +- .../io/quarkus/it/main/ServletITCase.java | 4 +- .../io/quarkus/it/main/SwaggerUIITCase.java | 4 +- .../io/quarkus/it/main/TransactionITCase.java | 4 +- .../io/quarkus/it/main/ValidatorITCase.java | 4 +- .../io/quarkus/it/main/WebsocketITCase.java | 4 +- .../org/acme/my/project/itest/it/ItestIT.java | 4 +- .../it/mongodb/NativeBookResourceIT.java | 4 +- .../mongodb/panache/NativeBookResourceIT.java | 4 +- .../Neo4jFunctionalityInGraalITCase.java | 4 +- .../it/keycloak/CodeFlowInGraalITCase.java | 4 +- ...BearerTokenAuthorizationInGraalITCase.java | 4 +- .../mysql/client/NativeFruitsEndpointIT.java | 4 +- .../pg/client/NativeFruitsEndpointIT.java | 4 +- .../jackson/GreetingResourceTestIT.java | 4 +- .../it/spring/data/jpa/BookResourceIT.java | 4 +- .../it/spring/data/jpa/CatResourceIT.java | 4 +- .../it/spring/data/jpa/CountryResourceIT.java | 4 +- .../it/spring/data/jpa/MovieResourceIT.java | 4 +- .../it/spring/data/jpa/PersonResourceIT.java | 4 +- .../it/spring/data/jpa/PostResourceIT.java | 4 +- .../spring/InjectedSpringBeansResourceIT.java | 4 +- .../it/spring/web/SpringControllerIT.java | 4 +- .../quarkus/it/extension/ExtensionITCase.java | 4 +- .../it/tika/NativeTikaEmbeddedContentIT.java | 4 +- .../quarkus/it/tika/NativeTikaParserIT.java | 4 +- .../it/tika/NativeTikaPdfInvoiceIT.java | 4 +- .../quarkus/it/vault/VaultInGraalITCase.java | 4 +- .../NettyMainEventLoopGroupResourceIT.java | 4 +- .../it/vertx/VertxProducerResourceIT.java | 4 +- .../java/io/quarkus/it/vertx/EventBusIT.java | 4 +- .../io/quarkus/it/vertx/JsonReaderIT.java | 4 +- .../io/quarkus/it/vertx/JsonWriterIT.java | 4 +- .../it/vertx/VertxProducerResourceIT.java | 4 +- .../quarkus/test/common/TestScopeManager.java | 8 ++-- .../test/junit/DisabledOnNativeImage.java | 17 +++++++ .../junit/DisabledOnNativeImageCondition.java | 44 +++++++++++++++++++ .../test/junit/DisabledOnSubstrate.java | 4 ++ .../junit/DisabledOnSubstrateCondition.java | 5 +++ .../quarkus/test/junit/NativeImageTest.java | 29 ++++++++++++ .../test/junit/QuarkusTestExtension.java | 35 ++++++++++----- .../io/quarkus/test/junit/SubstrateTest.java | 3 ++ 124 files changed, 361 insertions(+), 246 deletions(-) create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImage.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImageCondition.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeImageTest.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java b/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java index 29388b6b8..1dfe0a25b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java @@ -2,7 +2,7 @@ package io.quarkus.deployment.test; public interface TestScopeSetup { - void setup(boolean isSubstrateTest); + void setup(boolean isNativeImageTest); - void tearDown(boolean isSubstrateTest); + void tearDown(boolean isNativeImageTest); } diff --git a/devtools/gradle/src/test/resources/gradle-project/build.gradle b/devtools/gradle/src/test/resources/gradle-project/build.gradle index 17dd5e44a..bfd155407 100644 --- a/devtools/gradle/src/test/resources/gradle-project/build.gradle +++ b/devtools/gradle/src/test/resources/gradle-project/build.gradle @@ -30,6 +30,6 @@ test { dependsOn 'cleanTest' useJUnitPlatform() - // @SubstrateTest and JVM mode tests can't be mixed in the same run + // @NativeImageTest and JVM mode tests can't be mixed in the same run forkEvery 1 } diff --git a/devtools/maven/src/main/resources/create-extension-templates/IT.java b/devtools/maven/src/main/resources/create-extension-templates/IT.java index dc31bd0e9..90559784b 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/IT.java +++ b/devtools/maven/src/main/resources/create-extension-templates/IT.java @@ -1,8 +1,8 @@ package [=javaPackageBase].it; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class [=artifactIdBaseCamelCase]IT extends [=artifactIdBaseCamelCase]Test { } diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/native-test-resource-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/native-test-resource-template.ftl index c228cd1d7..3e798bfaa 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/native-test-resource-template.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/native-test-resource-template.ftl @@ -1,8 +1,8 @@ package ${package_name}; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class Native${class_name}IT extends ${class_name}Test { // Execute the same tests but in native mode. diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl index f22e57bc5..b8b34d417 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl @@ -1,6 +1,6 @@ package ${package_name} -import io.quarkus.test.junit.SubstrateTest +import io.quarkus.test.junit.NativeImageTest -@SubstrateTest +@NativeImageTest open class Native${class_name}IT : ${class_name}Test() diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/native-test-resource-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/native-test-resource-template.ftl index 67dc61379..ee89a757a 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/native-test-resource-template.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/native-test-resource-template.ftl @@ -1,6 +1,6 @@ package ${package_name} -import io.quarkus.test.junit.SubstrateTest +import io.quarkus.test.junit.NativeImageTest -@SubstrateTest +@NativeImageTest class Native${class_name}IT extends ${class_name}Test diff --git a/docs/src/main/asciidoc/building-native-image-guide.adoc b/docs/src/main/asciidoc/building-native-image-guide.adoc index 30031db1c..7e8d3c8a3 100644 --- a/docs/src/main/asciidoc/building-native-image-guide.adoc +++ b/docs/src/main/asciidoc/building-native-image-guide.adoc @@ -193,9 +193,9 @@ Then, open the `src/test/java/org/acme/quickstart/NativeGreetingResourceIT.java` package org.acme.quickstart; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest // <1> +@NativeImageTest // <1> public class NativeGreetingResourceIT extends GreetingResourceTest { // <2> // Run the same tests @@ -254,7 +254,7 @@ you can only test via HTTP calls. Your test code does not actually run natively, that does not call your HTTP endpoints, it's probably not a good idea to run them as part of native tests. If you share your test class between JVM and native executions like we advise above, you can mark certain tests -with the `@DisabledOnSubstrate` annotation in order to only run them on the JVM. +with the `@DisabledOnNativeImage` annotation in order to only run them on the JVM. == Creating a container diff --git a/docs/src/main/asciidoc/getting-started-testing.adoc b/docs/src/main/asciidoc/getting-started-testing.adoc index 01ef149be..df332bee6 100644 --- a/docs/src/main/asciidoc/getting-started-testing.adoc +++ b/docs/src/main/asciidoc/getting-started-testing.adoc @@ -354,7 +354,7 @@ There are a few system properties that can be used to tune the bootstrap of the == Native Executable Testing -It is also possible to test native executables using `@SubstrateTest`. This supports all the features mentioned in this +It is also possible to test native executables using `@NativeImageTest`. This supports all the features mentioned in this guide except injecting into tests (and the native executable runs in a separate non-JVM process this is not really possible). diff --git a/docs/src/main/asciidoc/maven-tooling.adoc b/docs/src/main/asciidoc/maven-tooling.adoc index c9bbb55c1..13e96e70d 100644 --- a/docs/src/main/asciidoc/maven-tooling.adoc +++ b/docs/src/main/asciidoc/maven-tooling.adoc @@ -440,7 +440,7 @@ If you have not used <>, add the following <1> Optionally use a BOM file to omit the version of the different Quarkus dependencies. <2> Use the Quarkus Maven plugin that will hook into the build process <3> Use a native profile and plugin to activate GraalVM compilation -<4> If you want to test your native executable with Integration Tests, add the following plugin configuration. Test names `*IT` and annotated `@SubstrateTest` will be run against the native executable. See the link:building-native-image-guide.html[Native executable guide] for more info. +<4> If you want to test your native executable with Integration Tests, add the following plugin configuration. Test names `*IT` and annotated `@NativeImageTest` will be run against the native executable. See the link:building-native-image-guide.html[Native executable guide] for more info. [[uber-jar-maven]] === Uber-Jar Creation diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java index 692967f56..96372fda5 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java @@ -11,8 +11,8 @@ public class ArcTestRequestScopeProvider implements TestScopeSetup { private static final Logger LOGGER = Logger.getLogger(ArcTestRequestScopeProvider.class); @Override - public void setup(boolean isSubstrateTest) { - if (isSubstrateTest) { + public void setup(boolean isNativeImageTest) { + if (isNativeImageTest) { return; } ArcContainer container = Arc.container(); @@ -25,8 +25,8 @@ public class ArcTestRequestScopeProvider implements TestScopeSetup { } @Override - public void tearDown(boolean isSubstrateTest) { - if (isSubstrateTest) { + public void tearDown(boolean isNativeImageTest) { + if (isNativeImageTest) { return; } ArcContainer container = Arc.container(); diff --git a/integration-tests/amazon-dynamodb/src/test/java/io/quarkus/it/dynamodb/DynamoDbFunctionalityITCase.java b/integration-tests/amazon-dynamodb/src/test/java/io/quarkus/it/dynamodb/DynamoDbFunctionalityITCase.java index ca2cfa5a8..1f1a58c1e 100644 --- a/integration-tests/amazon-dynamodb/src/test/java/io/quarkus/it/dynamodb/DynamoDbFunctionalityITCase.java +++ b/integration-tests/amazon-dynamodb/src/test/java/io/quarkus/it/dynamodb/DynamoDbFunctionalityITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.dynamodb; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class DynamoDbFunctionalityITCase extends DynamoDbFunctionalityTest { } diff --git a/integration-tests/amazon-lambda-http-it/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java b/integration-tests/amazon-lambda-http-it/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java index 6c2087a0c..7bf1a2732 100644 --- a/integration-tests/amazon-lambda-http-it/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java +++ b/integration-tests/amazon-lambda-http-it/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.amazon.lambda; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase { } diff --git a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java index 6c2087a0c..7bf1a2732 100644 --- a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java +++ b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.amazon.lambda; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase { } diff --git a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java index 062348efe..d1c630300 100644 --- a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java +++ b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.artemis; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ArtemisConsumerITCase extends ArtemisConsumerTest { } diff --git a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java index d8aea4c88..448aea2bd 100644 --- a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java +++ b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.artemis; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ArtemisProducerITCase extends ArtemisProducerTest { } diff --git a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java index 062348efe..d1c630300 100644 --- a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java +++ b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisConsumerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.artemis; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ArtemisConsumerITCase extends ArtemisConsumerTest { } diff --git a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java index d8aea4c88..448aea2bd 100644 --- a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java +++ b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisProducerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.artemis; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ArtemisProducerITCase extends ArtemisProducerTest { } diff --git a/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/BaseAuthIT.java b/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/BaseAuthIT.java index bca00f871..75697d714 100644 --- a/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/BaseAuthIT.java +++ b/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/BaseAuthIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.elytron; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class BaseAuthIT extends BaseAuthTest { } diff --git a/integration-tests/elytron-security-jdbc/src/test/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcIT.java b/integration-tests/elytron-security-jdbc/src/test/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcIT.java index 45da05cfe..f9bb32571 100644 --- a/integration-tests/elytron-security-jdbc/src/test/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcIT.java +++ b/integration-tests/elytron-security-jdbc/src/test/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcIT.java @@ -1,8 +1,8 @@ package io.quarkus.elytron.security.jdbc.it; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class ElytronSecurityJdbcIT extends ElytronSecurityJdbcTest { } diff --git a/integration-tests/elytron-security-oauth2/src/test/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResourceITCase.java b/integration-tests/elytron-security-oauth2/src/test/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResourceITCase.java index dbfa85345..b858c6f68 100644 --- a/integration-tests/elytron-security-oauth2/src/test/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResourceITCase.java +++ b/integration-tests/elytron-security-oauth2/src/test/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResourceITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.elytron.oauth2; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class ElytronOauth2ExtensionResourceITCase extends ElytronOauth2ExtensionResourceTestCase { } diff --git a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCAITCase.java b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCAITCase.java index f767f67c5..14d30a26d 100644 --- a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCAITCase.java +++ b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCAITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.elytron; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JCAITCase extends JCATestCase { } diff --git a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/X500PrincipalUtilITCase.java b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/X500PrincipalUtilITCase.java index 7a4fd8e66..478dc06c2 100644 --- a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/X500PrincipalUtilITCase.java +++ b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/X500PrincipalUtilITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.elytron; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class X500PrincipalUtilITCase extends X500PrincipalUtilTestCase { } diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthIT.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthIT.java index 62b1da5b5..88489e098 100644 --- a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthIT.java +++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.undertow.elytron; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class BaseAuthIT extends BaseAuthTest { } diff --git a/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityNativeIT.java b/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityNativeIT.java index 17184e767..ebd585bb2 100644 --- a/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityNativeIT.java +++ b/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityNativeIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.flyway; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class FlywayFunctionalityNativeIT extends FlywayFunctionalityTest { } diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java index b4342608d..f67a86748 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.panache; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various Panache operations running in native mode */ -@SubstrateTest +@NativeImageTest public class PanacheFunctionalityInGraalITCase extends PanacheFunctionalityTest { } diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java index fe51ed7f3..1c209e6b1 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.DisabledOnSubstrate; +import io.quarkus.test.junit.DisabledOnNativeImage; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -39,7 +39,7 @@ public class PanacheFunctionalityTest { "666Eddie1DECEASED")); } - @DisabledOnSubstrate + @DisabledOnNativeImage @Test public void testPanacheInTest() { Assertions.assertEquals(0, Person.count()); diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java b/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java index acd268ba1..04af1feea 100644 --- a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java +++ b/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.elasticsearch; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ElasticsearchClientInGraalIT extends ElasticsearchClientTest { } diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java b/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java index 9a92097f0..732d2786c 100644 --- a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java +++ b/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.elasticsearch; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class HibernateSearchInGraalIT extends HibernateSearchTest { } diff --git a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityInGraalITCase.java b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityInGraalITCase.java index 31dd99b92..c672b87fb 100644 --- a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityInGraalITCase.java +++ b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.validator; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various Bean Validation operations running in native mode */ -@SubstrateTest +@NativeImageTest public class HibernateValidatorFunctionalityInGraalITCase extends HibernateValidatorFunctionalityTest { } diff --git a/integration-tests/infinispan-cache-jpa/src/test/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityInGraalITCase.java b/integration-tests/infinispan-cache-jpa/src/test/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityInGraalITCase.java index 6b027b48a..b33434de6 100644 --- a/integration-tests/infinispan-cache-jpa/src/test/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityInGraalITCase.java +++ b/integration-tests/infinispan-cache-jpa/src/test/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.infinispan.cache.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class InfinispanCacheJPAFunctionalityInGraalITCase extends InfinispanCacheJPAFunctionalityTest { } diff --git a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityInGraalITCase.java b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityInGraalITCase.java index 51ee3bc09..60d2dbf19 100644 --- a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityInGraalITCase.java +++ b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.infinispan.client; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author William Burns */ -@SubstrateTest +@NativeImageTest public class InfinispanClientFunctionalityInGraalITCase extends InfinispanClientFunctionalityTest { } diff --git a/integration-tests/infinispan-embedded/src/test/java/io/quarkus/it/infinispan/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java b/integration-tests/infinispan-embedded/src/test/java/io/quarkus/it/infinispan/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java index 8ef4f2a8a..331124f39 100644 --- a/integration-tests/infinispan-embedded/src/test/java/io/quarkus/it/infinispan/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java +++ b/integration-tests/infinispan-embedded/src/test/java/io/quarkus/it/infinispan/embedded/InfinispanEmbeddedFunctionalityInGraalITCase.java @@ -1,13 +1,13 @@ package io.quarkus.it.infinispan.embedded; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author William Burns */ @QuarkusTestResource(InfinispanEmbeddedTestResource.class) -@SubstrateTest +@NativeImageTest public class InfinispanEmbeddedFunctionalityInGraalITCase extends InfinispanEmbeddedFunctionalityTest { } diff --git a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/InheritedModelWithBuilderResourceIT.java b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/InheritedModelWithBuilderResourceIT.java index d851b198d..8542b3016 100644 --- a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/InheritedModelWithBuilderResourceIT.java +++ b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/InheritedModelWithBuilderResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.reproducer; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class InheritedModelWithBuilderResourceIT extends InheritedModelWithBuilderResourceTest { // Execute the same tests but in native mode. diff --git a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithBuilderResourceIT.java b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithBuilderResourceIT.java index 421b26568..f854d2eba 100644 --- a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithBuilderResourceIT.java +++ b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithBuilderResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.reproducer; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ModelWithBuilderResourceIT extends ModelWithBuilderResourceTest { // Execute the same tests but in native mode. diff --git a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithSerializerAndDeserializerOnFieldResourceIT.java b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithSerializerAndDeserializerOnFieldResourceIT.java index d7492e72f..6be3abd5a 100644 --- a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithSerializerAndDeserializerOnFieldResourceIT.java +++ b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/ModelWithSerializerAndDeserializerOnFieldResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.reproducer; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ModelWithSerializerAndDeserializerOnFieldResourceIT extends ModelWithSerializerAndDeserializerOnFieldResourceTest { } diff --git a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/RegisteredPojoModelResourceIT.java b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/RegisteredPojoModelResourceIT.java index adeab4f43..61f2563b5 100644 --- a/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/RegisteredPojoModelResourceIT.java +++ b/integration-tests/jackson/service/src/test/java/io/quarkus/reproducer/RegisteredPojoModelResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.reproducer; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class RegisteredPojoModelResourceIT extends RegisteredPojoModelResourceTest { // Execute the same tests but in native mode. diff --git a/integration-tests/jgit/src/test/java/io/quarkus/it/jgit/NativeJGitIT.java b/integration-tests/jgit/src/test/java/io/quarkus/it/jgit/NativeJGitIT.java index c25e0f018..b3674ffe7 100644 --- a/integration-tests/jgit/src/test/java/io/quarkus/it/jgit/NativeJGitIT.java +++ b/integration-tests/jgit/src/test/java/io/quarkus/it/jgit/NativeJGitIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.jgit; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeJGitIT extends JGitTest { } diff --git a/integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/JPAFunctionalityInGraalITCase.java index 481653bb9..71d9e9d3d 100644 --- a/integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.derby; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/JPAFunctionalityInGraalITCase.java index f89a6f310..e048df99d 100644 --- a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.h2; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-mariadb/src/test/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-mariadb/src/test/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityInGraalITCase.java index 7579d7234..dd773703a 100644 --- a/integration-tests/jpa-mariadb/src/test/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-mariadb/src/test/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.mariadb; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityInGraalITCase.java index 70cf084dd..40bd3fc49 100644 --- a/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.mssql; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/JPAFunctionalityInGraalITCase.java index 251fc81cb..a1c199317 100644 --- a/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.mysql; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityInGraalITCase.java b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityInGraalITCase.java index 41a42e503..4b4eab24a 100644 --- a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityInGraalITCase.java +++ b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.postgresql; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various JPA operations running in native mode */ -@SubstrateTest +@NativeImageTest public class JPAFunctionalityInGraalITCase extends JPAFunctionalityTest { } diff --git a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAReflectionInGraalITCase.java b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAReflectionInGraalITCase.java index 7d3984ca5..03fe00f3f 100644 --- a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAReflectionInGraalITCase.java +++ b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/JPAReflectionInGraalITCase.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; import io.restassured.RestAssured; /** @@ -12,7 +12,7 @@ import io.restassured.RestAssured; * * @author Emmanuel Bernard emmanuel@hibernate.org */ -@SubstrateTest +@NativeImageTest public class JPAReflectionInGraalITCase { @Test diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAConfigurationlessTestInGraalITCase.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAConfigurationlessTestInGraalITCase.java index 828720c82..149698fae 100644 --- a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAConfigurationlessTestInGraalITCase.java +++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAConfigurationlessTestInGraalITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.configurationless; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JPAConfigurationlessTestInGraalITCase extends JPAConfigurationlessTest { } diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAElementCollectionInGraalITCase.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAElementCollectionInGraalITCase.java index 92a9e0262..5c90f5108 100644 --- a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAElementCollectionInGraalITCase.java +++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPAElementCollectionInGraalITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.configurationless; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JPAElementCollectionInGraalITCase extends JPAElementCollectionTest { } diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPALoadScriptTestInGraalITCase.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPALoadScriptTestInGraalITCase.java index 22bdf3fca..7658f306d 100644 --- a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPALoadScriptTestInGraalITCase.java +++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPALoadScriptTestInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.configurationless; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Emmanuel Bernard emmanuel@hibernate.org */ -@SubstrateTest +@NativeImageTest public class JPALoadScriptTestInGraalITCase extends JPALoadScriptTest { } diff --git a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceIT.java b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceIT.java index 3cd6030b0..5721dd623 100644 --- a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceIT.java +++ b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.jsonb; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ModelWithSerializerAndDeserializerOnFieldResourceIT extends ModelWithSerializerAndDeserializerOnFieldResourceTest { } diff --git a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerITCase.java b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerITCase.java index f8eb48897..72592cef5 100644 --- a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerITCase.java +++ b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.kafka; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class KafkaConsumerITCase extends KafkaConsumerTest { } diff --git a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerITCase.java b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerITCase.java index 4075439e8..5caaf87d9 100644 --- a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerITCase.java +++ b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.kafka; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class KafkaProducerITCase extends KafkaProducerTest { } diff --git a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsITCase.java b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsITCase.java index 874db3541..0b9ecbe0f 100644 --- a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsITCase.java +++ b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.kafka.streams; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class KafkaStreamsITCase extends KafkaStreamsTest { } diff --git a/integration-tests/keycloak-authorization/src/test/java/io/quarkus/it/keycloak/PolicyEnforcerInGraalITCase.java b/integration-tests/keycloak-authorization/src/test/java/io/quarkus/it/keycloak/PolicyEnforcerInGraalITCase.java index 375d9432f..42b175692 100644 --- a/integration-tests/keycloak-authorization/src/test/java/io/quarkus/it/keycloak/PolicyEnforcerInGraalITCase.java +++ b/integration-tests/keycloak-authorization/src/test/java/io/quarkus/it/keycloak/PolicyEnforcerInGraalITCase.java @@ -1,12 +1,12 @@ package io.quarkus.it.keycloak; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Pedro Igor */ @QuarkusTestResource(KeycloakTestResource.class) -@SubstrateTest +@NativeImageTest public class PolicyEnforcerInGraalITCase extends PolicyEnforcerTest { } diff --git a/integration-tests/kogito-maven/src/test/resources/projects/simple-kogito/src/test/java/org/acme/kogito/PersonProcessInGraalIT.java b/integration-tests/kogito-maven/src/test/resources/projects/simple-kogito/src/test/java/org/acme/kogito/PersonProcessInGraalIT.java index 55796fb83..c395cba95 100644 --- a/integration-tests/kogito-maven/src/test/resources/projects/simple-kogito/src/test/java/org/acme/kogito/PersonProcessInGraalIT.java +++ b/integration-tests/kogito-maven/src/test/resources/projects/simple-kogito/src/test/java/org/acme/kogito/PersonProcessInGraalIT.java @@ -1,8 +1,8 @@ package org.acme.kogito; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class PersonProcessInGraalIT extends PersonProcessTest { } diff --git a/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/drools/DroolsTestIT.java b/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/drools/DroolsTestIT.java index c983044b0..d68b883e9 100644 --- a/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/drools/DroolsTestIT.java +++ b/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/drools/DroolsTestIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.kogito.drools; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class DroolsTestIT extends DroolsTest { } diff --git a/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/jbpm/OrdersProcessTestIT.java b/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/jbpm/OrdersProcessTestIT.java index d8e7b9679..2b38a51de 100644 --- a/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/jbpm/OrdersProcessTestIT.java +++ b/integration-tests/kogito/src/test/java/io/quarkus/it/kogito/jbpm/OrdersProcessTestIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.kogito.jbpm; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class OrdersProcessTestIT extends OrdersProcessTest { } diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTestIT.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTestIT.java index c8c027237..b17cd1aea 100644 --- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTestIT.java +++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTestIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.kubernetes.client; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class KubernetesClientTestIT extends KubernetesClientTest { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/CharacterSetSupportITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/CharacterSetSupportITCase.java index 139160a41..bead220f6 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/CharacterSetSupportITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/CharacterSetSupportITCase.java @@ -4,10 +4,10 @@ import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; import io.restassured.RestAssured; -@SubstrateTest +@NativeImageTest public class CharacterSetSupportITCase { @Test diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesITCase.java index 4d44ce586..d9c64c27f 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ConfigPropertiesITCase extends ConfigPropertiesTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationITCase.java index 2a898f249..238e84cc5 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ContextPropagationITCase extends ContextPropagationTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/CoreReflectionInGraalITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/CoreReflectionInGraalITCase.java index bf944adbc..091f7f6da 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/CoreReflectionInGraalITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/CoreReflectionInGraalITCase.java @@ -4,10 +4,10 @@ import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; import io.restassured.RestAssured; -@SubstrateTest +@NativeImageTest public class CoreReflectionInGraalITCase { @Test diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/CustomConfigSourceITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/CustomConfigSourceITCase.java index 798fa0755..73701df70 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/CustomConfigSourceITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/CustomConfigSourceITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class CustomConfigSourceITCase extends CustomConfigSourceTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/DataSourceTransactionITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/DataSourceTransactionITCase.java index f9234cd10..2462737fa 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/DataSourceTransactionITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/DataSourceTransactionITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class DataSourceTransactionITCase extends DataSourceTransactionTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/DatasourceITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/DatasourceITCase.java index 987325a42..bf7160dac 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/DatasourceITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/DatasourceITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class DatasourceITCase extends DatasourceTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ExternalIndexITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ExternalIndexITCase.java index dead21793..d67b32398 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ExternalIndexITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ExternalIndexITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ExternalIndexITCase extends ExternalIndexTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceITCase.java index 16a7a7646..da6ac83d0 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class FaultToleranceITCase extends FaultToleranceTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthCheckTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthCheckTestCase.java index 40cb66fbd..b1391391f 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthCheckTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthCheckTestCase.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; import org.wildfly.common.Assert; import io.quarkus.it.health.SimpleHealthCheck; +import io.quarkus.test.junit.NativeImageTest; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.SubstrateTest; @@ -22,6 +23,7 @@ public class HealthCheckTestCase { @Test public void testInjection() { Assumptions.assumeFalse(getClass().isAnnotationPresent(SubstrateTest.class)); + Assumptions.assumeFalse(getClass().isAnnotationPresent(NativeImageTest.class)); Assert.assertTrue(checkks.call().getState() == HealthCheckResponse.State.UP); } } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthITCase.java index 662cf1501..bf7f21480 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class HealthITCase extends HealthTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JPABootstrapITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JPABootstrapITCase.java index fed497911..75da407ed 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JPABootstrapITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JPABootstrapITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JPABootstrapITCase extends JPABootstrapTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JPAReflectionInGraalITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JPAReflectionInGraalITCase.java index a2f53ab2e..5d92068f9 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JPAReflectionInGraalITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JPAReflectionInGraalITCase.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; import io.restassured.RestAssured; /** @@ -12,7 +12,7 @@ import io.restassured.RestAssured; * * @author Emmanuel Bernard emmanuel@hibernate.org */ -@SubstrateTest +@NativeImageTest public class JPAReflectionInGraalITCase { @Test diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JPAUserTypeITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JPAUserTypeITCase.java index 0f4e07d86..0070e5c07 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JPAUserTypeITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JPAUserTypeITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JPAUserTypeITCase extends JPAUserTypeTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSITCase.java index 9a4493b48..216f5d720 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JaxRSITCase extends JaxRSTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbITCase.java index bae68ef09..6d15d4ada 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JaxbITCase extends JaxbTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java index 08738e738..7376159d9 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class MetricsITCase extends MetricsTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java index 03fdce973..455f69e21 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class MetricsInheritanceITCase extends MetricsInheritanceTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java index 344cc72ce..3997c5692 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class MetricsOnClassITCase extends MetricsOnClassTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigITCase.java index d1ca5bea5..a69183308 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class MicroProfileConfigITCase extends MicroProfileConfigTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiITCase.java index f08a30d6b..0ec6788f2 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Ken Finnigan */ -@SubstrateTest +@NativeImageTest public class OpenApiITCase extends OpenApiTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenTracingITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenTracingITCase.java index 0da158845..96ea1b34d 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenTracingITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenTracingITCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class OpenTracingITCase extends OpenTracingTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java index 6b109feef..9c0d8ea9a 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ProfileManagerITCase extends ProfileManagerTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/RBACAccessInGraalITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/RBACAccessInGraalITCase.java index d397fd774..5ded94cc8 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/RBACAccessInGraalITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/RBACAccessInGraalITCase.java @@ -1,10 +1,10 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com */ -@SubstrateTest +@NativeImageTest public class RBACAccessInGraalITCase extends RBACAccessTest { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsITCase.java index a287c96fa..ed81a29fe 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ReactiveStreamsOperatorsITCase extends ReactiveStreamsOperatorsTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/RequestScopeITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/RequestScopeITCase.java index 2fe5aae46..3c4a279d2 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/RequestScopeITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/RequestScopeITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class RequestScopeITCase extends RequestScopeTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientITCase.java index 97bab1187..7571f8edd 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class RestClientITCase extends RestClientTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ServletITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ServletITCase.java index 16b6ca5b8..26f04a848 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ServletITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ServletITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ServletITCase extends ServletTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUIITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUIITCase.java index a64ae8a9e..23921d6ca 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUIITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUIITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class SwaggerUIITCase extends SwaggerUITestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionITCase.java index c73efa84f..e7ffc5f94 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class TransactionITCase extends TransactionTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorITCase.java index 8ab8c2256..6fc7f2626 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class ValidatorITCase extends ValidatorTestCase { } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketITCase.java index 9497ec31a..38d7de48f 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketITCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketITCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class WebsocketITCase extends WebsocketTestCase { } diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/test/java/org/acme/my/project/itest/it/ItestIT.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/test/java/org/acme/my/project/itest/it/ItestIT.java index 2bec5e65d..dfb8ce413 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/test/java/org/acme/my/project/itest/it/ItestIT.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/test/java/org/acme/my/project/itest/it/ItestIT.java @@ -1,8 +1,8 @@ package org.acme.my.project.itest.it; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class ItestIT extends ItestTest { } diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceIT.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceIT.java index b1d49bb93..012f733c6 100644 --- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceIT.java +++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.mongodb; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class NativeBookResourceIT extends BookResourceTest { } diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/NativeBookResourceIT.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/NativeBookResourceIT.java index 77726773e..da98f6d46 100644 --- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/NativeBookResourceIT.java +++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/NativeBookResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.mongodb.panache; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class NativeBookResourceIT extends BookResourceTest { } diff --git a/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityInGraalITCase.java b/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityInGraalITCase.java index 57e3184fb..86c26db31 100644 --- a/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityInGraalITCase.java +++ b/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityInGraalITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.neo4j; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Test various Neo4j operations running in native mode. */ -@SubstrateTest +@NativeImageTest public class Neo4jFunctionalityInGraalITCase extends Neo4jFunctionalityTest { } diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowInGraalITCase.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowInGraalITCase.java index 11f423260..497f3308c 100644 --- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowInGraalITCase.java +++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowInGraalITCase.java @@ -3,13 +3,13 @@ package io.quarkus.it.keycloak; import org.junit.jupiter.api.Disabled; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Pedro Igor */ @QuarkusTestResource(KeycloakTestResource.class) -@SubstrateTest +@NativeImageTest @Disabled("While figuring out how to have different application.properties for different tests") public class CodeFlowInGraalITCase extends CodeFlowTest { } diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java index 7b99e45cd..b1a7c09c1 100644 --- a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java +++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; @QuarkusTestResource(KeycloakTestResource.class) -@SubstrateTest +@NativeImageTest public class BearerTokenAuthorizationInGraalITCase extends BearerTokenAuthorizationTest { } diff --git a/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/NativeFruitsEndpointIT.java b/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/NativeFruitsEndpointIT.java index 13b2c70b1..45ae02786 100644 --- a/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/NativeFruitsEndpointIT.java +++ b/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/NativeFruitsEndpointIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.reactive.mysql.client; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeFruitsEndpointIT extends FruitsEndpointTest { // Runs the same tests as the parent class diff --git a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/NativeFruitsEndpointIT.java b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/NativeFruitsEndpointIT.java index 382924efd..2d9061c04 100644 --- a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/NativeFruitsEndpointIT.java +++ b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/NativeFruitsEndpointIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.reactive.pg.client; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeFruitsEndpointIT extends FruitsEndpointTest { // Runs the same tests as the parent class diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTestIT.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTestIT.java index 33d5535dc..1f98fe9ab 100644 --- a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTestIT.java +++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTestIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.jackson; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest class GreetingResourceTestIT extends GreetingResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/BookResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/BookResourceIT.java index 21a02f7f2..9bbd4575a 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/BookResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/BookResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class BookResourceIT extends BookResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceIT.java index 5d4a4bdb2..9cf89ea34 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class CatResourceIT extends CatResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceIT.java index 23c28850e..4b750e9d9 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class CountryResourceIT extends CountryResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceIT.java index 4f4782a84..2d3ebf8db 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class MovieResourceIT extends MovieResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceIT.java index 62407e84d..da81f834f 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class PersonResourceIT extends PersonResourceTest { } diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceIT.java index 0ec24e05d..c83b210fa 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceIT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.data.jpa; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class PostResourceIT extends PostResourceTest { } diff --git a/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceIT.java b/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceIT.java index 7cf0d9e25..84f1e7466 100644 --- a/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceIT.java +++ b/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class InjectedSpringBeansResourceIT extends InjectedSpringBeansResourceTest { } diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerIT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerIT.java index a964e4cdd..c2f41fe9f 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerIT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.web; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class SpringControllerIT extends SpringControllerTest { } diff --git a/integration-tests/test-extension/src/test/java/io/quarkus/it/extension/ExtensionITCase.java b/integration-tests/test-extension/src/test/java/io/quarkus/it/extension/ExtensionITCase.java index 5a6aae580..33e47e6f0 100644 --- a/integration-tests/test-extension/src/test/java/io/quarkus/it/extension/ExtensionITCase.java +++ b/integration-tests/test-extension/src/test/java/io/quarkus/it/extension/ExtensionITCase.java @@ -1,11 +1,11 @@ package io.quarkus.it.extension; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * Native image tests */ -@SubstrateTest +@NativeImageTest public class ExtensionITCase extends ExtensionTestCase { } diff --git a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaEmbeddedContentIT.java b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaEmbeddedContentIT.java index d06953b71..879410383 100644 --- a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaEmbeddedContentIT.java +++ b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaEmbeddedContentIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.tika; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeTikaEmbeddedContentIT extends TikaEmbeddedContentTest { } diff --git a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaParserIT.java b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaParserIT.java index 185d685f5..422d33192 100644 --- a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaParserIT.java +++ b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaParserIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.tika; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeTikaParserIT extends TikaParserTest { } diff --git a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaPdfInvoiceIT.java b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaPdfInvoiceIT.java index 790860812..b68b38d1a 100644 --- a/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaPdfInvoiceIT.java +++ b/integration-tests/tika/src/test/java/io/quarkus/it/tika/NativeTikaPdfInvoiceIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.tika; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NativeTikaPdfInvoiceIT extends TikaPdfInvoiceTest { } diff --git a/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultInGraalITCase.java b/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultInGraalITCase.java index 4bd8919a5..8d421c144 100644 --- a/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultInGraalITCase.java +++ b/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultInGraalITCase.java @@ -4,10 +4,10 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; import io.quarkus.vault.test.VaultTestLifecycleManager; -@SubstrateTest +@NativeImageTest @QuarkusTestResource(VaultTestLifecycleManager.class) @DisabledOnOs(OS.WINDOWS) public class VaultInGraalITCase extends VaultTest { diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/NettyMainEventLoopGroupResourceIT.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/NettyMainEventLoopGroupResourceIT.java index baf6d24f4..bdf89afa5 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/NettyMainEventLoopGroupResourceIT.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/NettyMainEventLoopGroupResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class NettyMainEventLoopGroupResourceIT extends NettyMainEventLoopGroupResourceTest { } diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java index fb13de042..f5c900965 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class VertxProducerResourceIT extends VertxProducerResourceTest { } \ No newline at end of file diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/EventBusIT.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/EventBusIT.java index 68187c2da..b537a3ce9 100644 --- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/EventBusIT.java +++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/EventBusIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class EventBusIT extends EventBusTest { } diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonReaderIT.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonReaderIT.java index 8aa9718ec..525cc930e 100644 --- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonReaderIT.java +++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonReaderIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class JsonReaderIT extends JsonReaderTest { } diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonWriterIT.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonWriterIT.java index d2c5e7876..c4e03dab8 100644 --- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonWriterIT.java +++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/JsonWriterIT.java @@ -1,11 +1,11 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; /** * @author Thomas Segismont */ -@SubstrateTest +@NativeImageTest public class JsonWriterIT extends JsonWriterTest { } diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java index fb13de042..f5c900965 100644 --- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java +++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -import io.quarkus.test.junit.SubstrateTest; +import io.quarkus.test.junit.NativeImageTest; -@SubstrateTest +@NativeImageTest public class VertxProducerResourceIT extends VertxProducerResourceTest { } \ No newline at end of file diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java index f0851e42d..943d67932 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java @@ -16,15 +16,15 @@ public class TestScopeManager { } } - public static void setup(boolean isSubstrateTest) { + public static void setup(boolean isNativeImageTest) { for (TestScopeSetup i : SCOPE_MANAGERS) { - i.setup(isSubstrateTest); + i.setup(isNativeImageTest); } } - public static void tearDown(boolean isSubstrateTest) { + public static void tearDown(boolean isNativeImageTest) { for (TestScopeSetup i : SCOPE_MANAGERS) { - i.tearDown(isSubstrateTest); + i.tearDown(isNativeImageTest); } } } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImage.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImage.java new file mode 100644 index 000000000..58a50f542 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImage.java @@ -0,0 +1,17 @@ +package io.quarkus.test.junit; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DisabledOnNativeImage { + /** + * Reason for disabling this test + */ + public String value() default ""; +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImageCondition.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImageCondition.java new file mode 100644 index 000000000..a7b07a22f --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnNativeImageCondition.java @@ -0,0 +1,44 @@ +package io.quarkus.test.junit; + +import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation; + +import java.lang.reflect.AnnotatedElement; +import java.util.Optional; + +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; +import org.junit.jupiter.api.extension.ExtensionContext.Store; +import org.junit.platform.commons.util.StringUtils; + +import io.quarkus.test.junit.QuarkusTestExtension.ExtensionState; + +public class DisabledOnNativeImageCondition implements ExecutionCondition { + + private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult + .enabled("@DisabledOnNativeImage is not present"); + + /** + * Containers/tests are disabled if {@code @DisabledOnNativeImage} is present on the test + * class or method and we're running on a native image. + */ + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + Optional element = context.getElement(); + Optional disabled = findAnnotation(element, DisabledOnNativeImage.class); + if (disabled.isPresent()) { + Store store = context.getStore(Namespace.GLOBAL); + ExtensionState state = (ExtensionState) store.get(ExtensionState.class.getName()); + if (state != null && state.isNativeImage()) { + String reason = disabled.map(DisabledOnNativeImage::value) + .filter(StringUtils::isNotBlank) + .orElseGet(() -> element.get() + " is @DisabledOnNativeImage"); + return ConditionEvaluationResult.disabled(reason); + } + } + + return ENABLED; + } + +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrate.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrate.java index f1d47bac5..afad62353 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrate.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrate.java @@ -6,6 +6,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @deprecated Use {@link DisabledOnNativeImage} instead. + */ +@Deprecated @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrateCondition.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrateCondition.java index 8484d435e..4c40c8daf 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrateCondition.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSubstrateCondition.java @@ -14,6 +14,11 @@ import org.junit.platform.commons.util.StringUtils; import io.quarkus.test.junit.QuarkusTestExtension.ExtensionState; +/** + * @deprecated Use {@link DisabledOnNativeImageCondition} instead. + * + */ +@Deprecated public class DisabledOnSubstrateCondition implements ExecutionCondition { private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeImageTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeImageTest.java new file mode 100644 index 000000000..818fcb0bb --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeImageTest.java @@ -0,0 +1,29 @@ +package io.quarkus.test.junit; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.extension.ExtendWith; + +/** + * Annotation that indicates that this test should be run using a native image, + * rather than in the JVM. This must also be combined with {@link QuarkusTestExtension}. + * + * The standard usage pattern is expected to be a base test class that runs the + * tests using the JVM version of Quarkus, with a subclass that extends the base + * test and is annotated with this annotation to perform the same checks against + * the native image. + * + * Note that it is not possible to mix JVM and native image tests in the same test + * run, it is expected that the JVM tests will be standard unit tests that are + * executed by surefire, while the native image tests will be integration tests + * executed by failsafe. + * + */ +@Target(ElementType.TYPE) +@ExtendWith({ QuarkusTestExtension.class, DisabledOnNativeImageCondition.class }) +@Retention(RetentionPolicy.RUNTIME) +public @interface NativeImageTest { +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index 3f2301d8e..8f09768fd 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -338,18 +338,20 @@ public class QuarkusTestExtension @Override public void afterEach(ExtensionContext context) throws Exception { if (!failedBoot) { - boolean substrateTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class); + boolean nativeImageTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class) + || context.getRequiredTestClass().isAnnotationPresent(NativeImageTest.class); restAssuredURLManager.clearURL(); - TestScopeManager.tearDown(substrateTest); + TestScopeManager.tearDown(nativeImageTest); } } @Override public void beforeEach(ExtensionContext context) throws Exception { if (!failedBoot) { - boolean substrateTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class); + boolean nativeImageTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class) + || context.getRequiredTestClass().isAnnotationPresent(NativeImageTest.class); restAssuredURLManager.setURL(); - TestScopeManager.setup(substrateTest); + TestScopeManager.setup(nativeImageTest); } } @@ -367,13 +369,14 @@ public class QuarkusTestExtension ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL); ExtensionState state = store.get(ExtensionState.class.getName(), ExtensionState.class); PropertyTestUtil.setLogFileProperty(); - boolean substrateTest = extensionContext.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class); + boolean nativeImageTest = extensionContext.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class) + || extensionContext.getRequiredTestClass().isAnnotationPresent(NativeImageTest.class); if (state == null) { TestResourceManager testResourceManager = new TestResourceManager(extensionContext.getRequiredTestClass()); try { Map systemProps = testResourceManager.start(); - if (substrateTest) { + if (nativeImageTest) { NativeImageLauncher launcher = new NativeImageLauncher(extensionContext.getRequiredTestClass()); launcher.addSystemProperties(systemProps); try { @@ -401,9 +404,9 @@ public class QuarkusTestExtension throw e; } } else { - if (substrateTest != state.isSubstrate()) { + if (nativeImageTest != state.isNativeImage()) { throw new RuntimeException( - "Attempted to mix @SubstrateTest and JVM mode tests in the same test run. This is not allowed."); + "Attempted to mix @NativeImageTest and JVM mode tests in the same test run. This is not allowed."); } } @@ -437,12 +440,12 @@ public class QuarkusTestExtension private final TestResourceManager testResourceManager; private final Closeable resource; - private final boolean substrate; + private final boolean nativeImage; - ExtensionState(TestResourceManager testResourceManager, Closeable resource, boolean substrate) { + ExtensionState(TestResourceManager testResourceManager, Closeable resource, boolean nativeImage) { this.testResourceManager = testResourceManager; this.resource = resource; - this.substrate = substrate; + this.nativeImage = nativeImage; } @Override @@ -460,8 +463,16 @@ public class QuarkusTestExtension } } + /** + * @deprecated Use {@link #isNativeImage()} instead. + */ + @Deprecated public boolean isSubstrate() { - return substrate; + return nativeImage; + } + + public boolean isNativeImage() { + return nativeImage; } } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/SubstrateTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/SubstrateTest.java index 39fe443f9..609e23f6e 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/SubstrateTest.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/SubstrateTest.java @@ -20,8 +20,11 @@ import org.junit.jupiter.api.extension.ExtendWith; * run, it is expected that the JVM tests will be standard unit tests that are * executed by surefire, while the native image tests will be integration tests * executed by failsafe. + * + * @deprecated Use {@link NativeImageTest} instead. * */ +@Deprecated @Target(ElementType.TYPE) @ExtendWith({ QuarkusTestExtension.class, DisabledOnSubstrateCondition.class }) @Retention(RetentionPolicy.RUNTIME)