Fix gradle test assertion

quarkusio · Nov 22, 2020 · 09eff10 · 09eff10
1 parent 09580ad
commit 09eff10
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
@@ -126,6 +126,12 @@ public void execute(Task test) {
             t.useJUnitPlatform();
             // quarkusBuild is expected to run after the project has passed the tests
             quarkusBuild.shouldRunAfter(t);
+            t.doLast(new Action<Task>() {
+                @Override
+                public void execute(Task task) {
+                    quarkusExt.afterTest(t);
+                }
+            });
         };
 
         project.getPlugins().withType(

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java
@@ -88,6 +88,11 @@ void beforeTest(Test task) {
         }
     }
 
+    void afterTest(Test task) {
+        task.getSystemProperties().remove(BootstrapConstants.SERIALIZED_APP_MODEL);
+        task.getSystemProperties().remove(BootstrapConstants.OUTPUT_SOURCES_DIR);
+    }
+
     public Path appJarOrClasses() {
         final Jar jarTask = (Jar) project.getTasks().findByName(JavaPlugin.JAR_TASK_NAME);
         if (jarTask == null) {

diff --git a/integration-tests/gradle/build.gradle b/integration-tests/gradle/build.gradle
@@ -50,7 +50,6 @@ test {
     if (System.properties.containsKey('maven.repo.local')) {
         systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
     }
-
     useJUnitPlatform()
 
     // Kotlin compiler does not support Java 14

diff --git a/...radle/src/test/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt b/...radle/src/test/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt
@@ -8,7 +8,7 @@ import javax.ws.rs.core.MediaType
 
 import org.acme.service.SimpleService
 
-@Path("/hello")
+@Path("/hello-kotlin")
 class ExampleResource {
 
     @Inject

diff --git a/...e/src/test/resources/multi-source-project/src/test/kotlin/org/acme/ExampleResourceTest.kt b/...e/src/test/resources/multi-source-project/src/test/kotlin/org/acme/ExampleResourceTest.kt
@@ -11,7 +11,7 @@ class ExampleResourceTest {
     @Test
     fun testHelloEndpoint() {
         given()
-          .`when`().get("/hello")
+          .`when`().get("/hello-kotlin")
           .then()
              .statusCode(200)
              .body(`is`("hello"))

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -218,7 +218,6 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
                     }
                 }
             }
-
             runnerBuilder.setApplicationRoot(rootBuilder.build());
 
             CuratedApplication curatedApplication = runnerBuilder