Skip to content

Commit 746467a

Browse files
machi1990gsmet
authored andcommitted
refactor: remove trailing usage of @substratetest
follows up #5007
1 parent 61e9386 commit 746467a

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

independent-projects/tools/common/src/test/resources/templates/basic-rest/java/native-test-resource-template.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ${package_name};
22

3-
import io.quarkus.test.junit.SubstrateTest;
3+
import io.quarkus.test.junit.NativeImageTest;
44

5-
@SubstrateTest
5+
@NativeImageTest
66
public class Native${class_name}IT extends ${class_name}Test {
77

88
// Execute the same tests but in native mode.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ${package_name}
22

3-
import io.quarkus.test.junit.SubstrateTest
3+
import io.quarkus.test.junit.NativeImageTest
44

5-
@SubstrateTest
5+
@NativeImageTest
66
open class Native${class_name}IT : ${class_name}Test()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ${package_name}
22

3-
import io.quarkus.test.junit.SubstrateTest
3+
import io.quarkus.test.junit.NativeImageTest
44

5-
@SubstrateTest
5+
@NativeImageTest
66
class Native${class_name}IT extends ${class_name}Test

integration-tests/main/src/test/java/io/quarkus/it/main/HealthCheckTestCase.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,24 @@
44

55
import org.eclipse.microprofile.health.HealthCheckResponse;
66
import org.eclipse.microprofile.health.Liveness;
7-
import org.junit.jupiter.api.Assumptions;
87
import org.junit.jupiter.api.Test;
98
import org.wildfly.common.Assert;
109

1110
import io.quarkus.it.health.SimpleHealthCheck;
12-
import io.quarkus.test.junit.NativeImageTest;
11+
import io.quarkus.test.junit.DisabledOnNativeImage;
1312
import io.quarkus.test.junit.QuarkusTest;
14-
import io.quarkus.test.junit.SubstrateTest;
1513

1614
@QuarkusTest
15+
@DisabledOnNativeImage("This test is not meant to be ran in native mode as Quarkus does not yet support injection " +
16+
"in native " + "tests - see https://quarkus.io/guides/getting-started-testing#native-executable-testing")
1717
public class HealthCheckTestCase {
1818

1919
@Inject
2020
@Liveness
21-
SimpleHealthCheck checkks;
21+
SimpleHealthCheck simpleHealthCheck;
2222

2323
@Test
2424
public void testInjection() {
25-
Assumptions.assumeFalse(getClass().isAnnotationPresent(SubstrateTest.class));
26-
Assumptions.assumeFalse(getClass().isAnnotationPresent(NativeImageTest.class));
27-
Assert.assertTrue(checkks.call().getState() == HealthCheckResponse.State.UP);
25+
Assert.assertTrue(simpleHealthCheck.call().getState() == HealthCheckResponse.State.UP);
2826
}
2927
}

integration-tests/test-extension/src/test/java/io/quarkus/it/extension/FinalFieldReflectionInGraalITCase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
import io.quarkus.test.junit.SubstrateTest;
88
import io.restassured.RestAssured;
99

10+
// TODO replace with @NativeImageTest once @SubstrateTest is removed.
11+
// Use @SubstrateTest for now to ensure backward compatibility.
1012
@SubstrateTest
1113
public class FinalFieldReflectionInGraalITCase {
1214

1315
@Test
14-
public void testFieldAndGetterReflectionOnEntityFromServlet() throws Exception {
16+
public void testFieldAndGetterReflectionOnEntityFromServlet() {
1517
RestAssured.when().get("/core/reflection/final").then()
1618
.body(is("OK"));
1719
}

0 commit comments

Comments
 (0)