Merge pull request #14805 from glefloch/fix/14799

Fix test in sample gradle projects
quarkusio · Feb 4, 2021 · 8c7b1b5 · 8c7b1b5
2 parents 188f646 + 76d807a
commit 8c7b1b5
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 42 deletions.
diff --git a/...ests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java b/...ests/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/...n-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java b/...n-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/...ources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java b/...ources/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";
     }
 }
diff --git a/...esources/add-remove-extension-single-module-kts/src/main/resources/application.properties b/...esources/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/...es/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java b/...es/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"));
-    }
 }
diff --git a/...esources/add-remove-extension-single-module-kts/src/test/resources/application.properties b/...esources/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/.../resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java b/.../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";
     }
 }
diff --git a/...st/resources/add-remove-extension-single-module/src/main/resources/application.properties b/...st/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/...ources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java b/...ources/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"));
-    }
 }
diff --git a/...st/resources/add-remove-extension-single-module/src/test/resources/application.properties b/...st/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