diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java index f3d1700c4d6ab..4c66932a39f8e 100644 --- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java @@ -39,7 +39,8 @@ public void testRemoveNonExistentExtension() throws IOException, URISyntaxExcept final File projectDir = getProjectDir("add-remove-extension-single-module-kts"); - runGradleWrapper(projectDir, "clean", "build"); + BuildResult buildResult = runGradleWrapper(projectDir, "clean", "build"); + assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME); final Path buildKts = projectDir.toPath().resolve("build.gradle.kts"); assertThat(buildKts).exists(); diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java index 43c30fdc31b7f..40ee566171989 100644 --- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java @@ -36,7 +36,8 @@ public void testRemoveNonExistentExtension() throws IOException, URISyntaxExcept final File projectDir = getProjectDir("add-remove-extension-single-module"); - runGradleWrapper(projectDir, "clean", "build"); + BuildResult buildResult = runGradleWrapper(projectDir, "clean", "build"); + assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME); final Path build = projectDir.toPath().resolve("build.gradle"); assertThat(build).exists(); diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java index d01ef472250e2..a4df5d8d739aa 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java @@ -6,19 +6,12 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.eclipse.microprofile.config.inject.ConfigProperty; - @Path("/hello") public class ExampleResource { - @ConfigProperty(name = "my-app-name") - String appName; - @ConfigProperty(name = "quarkus.application.version") - String appVersion; - @GET @Produces(MediaType.TEXT_PLAIN) public String hello() { - return appName + " " + appVersion; + return "Hello from Test"; } } \ No newline at end of file diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties index b18c72feda9df..75b9417d6dc14 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties @@ -1,3 +1,2 @@ # Configuration file # key = value -my-app-name=${quarkus.application.name} diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java index 9b92351468aa0..84adafee15420 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java @@ -17,13 +17,4 @@ public void testHelloEndpoint() { .statusCode(200) .body(is("Hello from Test")); } - - @Test - public void testTestOnly() { - given() - .when().get("test-only") - .then() - .statusCode(200) - .body(is("Test only")); - } } \ No newline at end of file diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties index b2340b5f9173f..c725bb2abf61b 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties @@ -1,5 +1,3 @@ # Configuration file # key = value -example.message=Hello from Test -test-only=Test only diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java index d01ef472250e2..a4df5d8d739aa 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java @@ -6,19 +6,12 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.eclipse.microprofile.config.inject.ConfigProperty; - @Path("/hello") public class ExampleResource { - @ConfigProperty(name = "my-app-name") - String appName; - @ConfigProperty(name = "quarkus.application.version") - String appVersion; - @GET @Produces(MediaType.TEXT_PLAIN) public String hello() { - return appName + " " + appVersion; + return "Hello from Test"; } } \ No newline at end of file diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties index b18c72feda9df..75b9417d6dc14 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties @@ -1,3 +1,2 @@ # Configuration file # key = value -my-app-name=${quarkus.application.name} diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java index 9b92351468aa0..84adafee15420 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java @@ -17,13 +17,4 @@ public void testHelloEndpoint() { .statusCode(200) .body(is("Hello from Test")); } - - @Test - public void testTestOnly() { - given() - .when().get("test-only") - .then() - .statusCode(200) - .body(is("Test only")); - } } \ No newline at end of file diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties index b2340b5f9173f..c725bb2abf61b 100644 --- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties +++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties @@ -1,5 +1,3 @@ # Configuration file # key = value -example.message=Hello from Test -test-only=Test only