Merge pull request #27686 from zakkak/replace-deprecated-annotations-…

…for-native-tests

Replace usages of `@DisabledOnNativeImage` and `@NativeImageTest`

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/native-test/java/org/acme/lambda/LambdaHandlerTestIT.java

@@ -1,8 +1,8 @@
 package org.acme.lambda;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class LambdaHandlerTestIT extends LambdaHandlerTest {
 
     // Execute the same tests but in native mode.

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java

@@ -1,8 +1,8 @@
 package org.acme.funqy;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class FunqyIT extends FunqyTest {
 
     // Run the same tests

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-knative-events-example/java/src/native-test/java/org/acme/funqy/cloudevent/FunqyIT.java

@@ -1,8 +1,8 @@
 package org.acme.funqy.cloudevent;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class FunqyIT extends FunqyTest {
 
     // Run the same tests

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/funqy-http-codestart/java/src/native-test/java/org/acme/MyFunctionsIT.java

@@ -1,8 +1,8 @@
 package org.acme;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class MyFunctionsIT extends MyFunctionsTest {
     // Run the same tests in native
 }

extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingIT.java

@@ -1,7 +1,7 @@
 package ${package};
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class GreetingIT extends GreetingTest {
 }

extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingIT.java

@@ -1,7 +1,7 @@
 package ${package};
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class GreetingIT extends GreetingTest {
 }

extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerIT.java

@@ -1,7 +1,7 @@
 package ${package};
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class LambdaHandlerIT extends LambdaHandlerTest {
 }

integration-tests/amazon-lambda-http-resteasy-reactive/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.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase {
 }

integration-tests/amazon-lambda-http-resteasy/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.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase {
 }

integration-tests/amazon-lambda-http/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.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase {
 }

integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java

@@ -1,7 +1,7 @@
 package io.quarkus.it.amazon.lambda;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaV1SimpleIT extends AmazonLambdaV1SimpleTestCase {
 }

integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventIT.java

@@ -1,7 +1,7 @@
 package io.quarkus.it.amazon.lambda;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class S3EventIT extends S3EventTestCase {
 }

integration-tests/amazon-lambda-stream-handler/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.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase {
 }

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.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class AmazonLambdaSimpleIT extends AmazonLambdaSimpleTestCase {
 }

integration-tests/awt/src/test/java/io/quarkus/awt/it/ImageDecodersIT.java

@@ -1,7 +1,7 @@
 package io.quarkus.awt.it;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class ImageDecodersIT extends ImageDecodersTest {
 }

integration-tests/awt/src/test/java/io/quarkus/awt/it/ImageEncodersIT.java

@@ -1,7 +1,7 @@
 package io.quarkus.awt.it;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class ImageEncodersIT extends ImageEncodersTest {
 }

integration-tests/awt/src/test/java/io/quarkus/awt/it/ImageGeometryFontsIT.java

@@ -1,7 +1,7 @@
 package io.quarkus.awt.it;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class ImageGeometryFontsIT extends ImageGeometryFontsTest {
 }

integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseITCase.java

@@ -2,14 +2,14 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit.DisabledOnNativeImage;
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
 public class BouncyCastleFipsJsseITCase extends BouncyCastleFipsJsseTestCase {
 
     @Test
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Override
     public void testListProviders() throws Exception {
         doTestListProviders();

integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/test/java/org/acme/kafka/KafkaClientTest.java

@@ -1,6 +1,5 @@
 package org.acme.kafka;
 
-import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
 

integration-tests/devtools/src/test/resources/__snapshots__/FunqyHttpCodestartTest/testContent/src_test_java_ilove_quark_us_MyFunctionsIT.java

@@ -1,8 +1,8 @@
 package ilove.quark.us;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class MyFunctionsIT extends MyFunctionsTest {
     // Run the same tests in native
 }

integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/native-test/java/org/acme/NativeExampleResourceIT.java

@@ -1,8 +1,8 @@
 package org.acme;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeExampleResourceIT extends ExampleResourceTest {
 
     // Execute the same tests but in native mode.

integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/native-test/java/org/acme/NativeExampleResourceIT.java

@@ -1,8 +1,8 @@
 package org.acme;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeExampleResourceIT extends ExampleResourceTest {
 
     // Execute the same tests but in native mode.

integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/src/native-test/java/org/acme/ExampleResourceNativeTest.java

@@ -1,6 +1,6 @@
 package org.acme;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class ExampleResourceNativeTest extends ExampleResourceTest {}

integration-tests/gradle/src/main/resources/kotlin-grpc-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt

@@ -1,6 +1,6 @@
 package org.acme
 
-import io.quarkus.test.junit.NativeImageTest
+import io.quarkus.test.junit.QuarkusIntegrationTest
 
-@NativeImageTest
+@QuarkusIntegrationTest
 class NativeExampleResourceIT : ExampleResourceTest()

integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/src/native-test/java/io/quarkus/reproducer/NativeExampleResourceIT.java

@@ -1,8 +1,8 @@
 package io.quarkus.reproducer;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeExampleResourceIT extends ExampleResourceTest {
 
     // Execute the same tests but in native mode.

integration-tests/gradle/src/main/resources/multi-module-with-empty-module/modB/src/native-test/java/org/acme/NativeGreetingResourceIT.java

@@ -1,8 +1,8 @@
 package org.acme;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeGreetingResourceIT extends GreetingResourceTest {
 
     // Execute the same tests but in native mode.

integration-tests/gradle/src/main/resources/multi-source-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt

@@ -1,6 +1,6 @@
 package org.acme
 
-import io.quarkus.test.junit.NativeImageTest
+import io.quarkus.test.junit.QuarkusIntegrationTest
 
-@NativeImageTest
+@QuarkusIntegrationTest
 class NativeExampleResourceIT : ExampleResourceTest()

integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/KotlinPanacheFunctionalityTest.kt

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.quarkus.it.panache.kotlin.Dog
 import io.quarkus.it.panache.kotlin.Person
-import io.quarkus.test.junit.DisabledOnNativeImage
+import io.quarkus.test.junit.DisabledOnIntegrationTest
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured
 import io.restassured.http.ContentType
@@ -41,7 +41,7 @@ open class KotlinPanacheFunctionalityTest {
      * This test is disabled in native mode as there is no interaction with the quarkus integration test endpoint.
      */
     @Test
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Throws(JsonProcessingException::class)
     fun jacksonDeserializationIgnoresPersistentAttribute() { // set Up
         val person = Person()
@@ -62,7 +62,7 @@ open class KotlinPanacheFunctionalityTest {
     }
 
     @Test
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     fun entityManagerIsInjected() {
         assertNotNull(Dog.getEntityManager())
     }

integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java

@@ -21,7 +21,6 @@
 
 import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.test.junit.DisabledOnIntegrationTest;
-import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -64,7 +63,7 @@ public void testPanacheSerialisation() {
                         "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><person><id>666</id><name>Eddie</name><serialisationTrick>1</serialisationTrick><status>DECEASED</status></person>"));
     }
 
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Test
     public void testPanacheInTest() {
         Assertions.assertEquals(0, Person.count());
@@ -105,7 +104,7 @@ public void testJaxbAnnotationTransfer() {
      * This test does not interact with the Quarkus application itself. It is just using the Jackson ObjectMapper with a
      * PanacheEntity. Thus this test is disabled in native mode. The test code runs the JVM and not native.
      */
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Test
     public void jacksonDeserializationIgnoresPersistentAttribute() throws JsonProcessingException {
         // set Up
@@ -126,7 +125,7 @@ public void jacksonDeserializationIgnoresPersistentAttribute() throws JsonProces
     /**
      * This test is disabled in native mode as there is no interaction with the quarkus integration test endpoint.
      */
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Test
     public void jaxbDeserializationHasAllFields() throws JsonProcessingException, JAXBException {
         // set Up
@@ -198,14 +197,14 @@ public void testMetrics() {
                         + PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME + "\",result=\"miss\"}"));
     }
 
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Transactional
     @Test
     void testBug7102InOneTransaction() {
         testBug7102();
     }
 
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Test
     public void testBug7102() {
         Person person = createBug7102();