Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace usages of @DisabledOnNativeImage and @NativeImageTest #27686

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.acme

import io.quarkus.test.junit.NativeImageTest
import io.quarkus.test.junit.QuarkusIntegrationTest

@NativeImageTest
@QuarkusIntegrationTest
class NativeExampleResourceIT : ExampleResourceTest()
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.acme

import io.quarkus.test.junit.NativeImageTest
import io.quarkus.test.junit.QuarkusIntegrationTest

@NativeImageTest
@QuarkusIntegrationTest
class NativeExampleResourceIT : ExampleResourceTest()
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand All @@ -62,7 +62,7 @@ open class KotlinPanacheFunctionalityTest {
}

@Test
@DisabledOnNativeImage
@DisabledOnIntegrationTest
fun entityManagerIsInjected() {
assertNotNull(Dog.getEntityManager())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand 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();
Expand Down
Loading