Merge pull request #23488 from edeandrea/18820

Use @QuarkusIntegrationTest in generated projects
quarkusio · Feb 22, 2022 · 27f7b3d · 27f7b3d
2 parents f23455d + c07801a
commit 27f7b3d
Show file tree

Hide file tree

Showing 59 changed files with 200 additions and 189 deletions.
diff --git a/...tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java b/...tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java
diff --git a/...ation-tests/src/test/java/{package-name.dir}/it/{class-name-base}ResourceIT.tpl.qute.java b/...ation-tests/src/test/java/{package-name.dir}/it/{class-name-base}ResourceIT.tpl.qute.java
@@ -0,0 +1,7 @@
+package {package-name}.it;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class {class-name-base}ResourceIT extends {class-name-base}ResourceTest {
+}
diff --git a/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
diff --git a/...steasy-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java b/...steasy-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class {resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
diff --git a/...easy-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt b/...easy-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT : {resource.class-name}Test()
diff --git a/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
diff --git a/...asy-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala b/...asy-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT extends {resource.class-name}Test
diff --git a/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
diff --git a/...active-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java b/...active-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class {resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
diff --git a/...tive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt b/...tive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT : {resource.class-name}Test()
diff --git a/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
diff --git a/...ive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala b/...ive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT extends {resource.class-name}Test
diff --git a/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/...-codestart/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
diff --git a/...ng-web-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java b/...ng-web-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class {resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/...odestart/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
diff --git a/...-web-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt b/...-web-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT : {resource.class-name}Test()
diff --git a/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/...destart/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
diff --git a/...web-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala b/...web-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class {resource.class-name}IT extends {resource.class-name}Test
diff --git a/.../src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/.../src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
@@ -77,7 +77,7 @@ void generateRESTEasyJavaCustom(TestInfo testInfo) throws Throwable {
         checkConfigProperties(projectDir);
 
         assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/com/andy/BonjourResource.java");
-        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/com/andy/NativeBonjourResourceIT.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/com/andy/BonjourResourceIT.java");
         assertThatMatchSnapshot(testInfo, projectDir, "src/main/resources/META-INF/resources/index.html");
     }
 
@@ -135,9 +135,9 @@ void generateRESTEasyKotlinCustom(TestInfo testInfo) throws Throwable {
                 .satisfies(checkContains("class BonjourResourceTest"))
                 .satisfies(checkContains("\"/bonjour\""));
 
-        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/com/andy/NativeBonjourResourceIT.kt")
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/com/andy/BonjourResourceIT.kt")
                 .satisfies(checkContains("package com.andy"))
-                .satisfies(checkContains("class NativeBonjourResourceIT : BonjourResourceTest"));
+                .satisfies(checkContains("class BonjourResourceIT : BonjourResourceTest"));
     }
 
     @Test
@@ -168,9 +168,9 @@ void generateRESTEasyScalaCustom(TestInfo testInfo) throws Throwable {
                 .satisfies(checkContains("class BonjourResourceTest"))
                 .satisfies(checkContains("\"/bonjour\""));
 
-        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/com/andy/NativeBonjourResourceIT.scala")
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/com/andy/BonjourResourceIT.scala")
                 .satisfies(checkContains("package com.andy"))
-                .satisfies(checkContains("class NativeBonjourResourceIT extends BonjourResourceTest"));
+                .satisfies(checkContains("class BonjourResourceIT extends BonjourResourceTest"));
     }
 
     @Test
@@ -188,7 +188,7 @@ void generateMavenDefaultJava(TestInfo testInfo) throws Throwable {
 
         assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
         assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
-        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeGreetingResourceIT.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceIT.java");
     }
 
     @Test
@@ -207,7 +207,7 @@ void generateMavenResteasyJava(TestInfo testInfo) throws Throwable {
 
         assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
         assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
-        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeGreetingResourceIT.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceIT.java");
     }
 
     @Test

diff --git a/...s-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java b/...s-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java
@@ -24,7 +24,7 @@ class RESTEasyCodestartTest {
     void testContent() throws Throwable {
         codestartTest.checkGeneratedSource("org.acme.GreetingResource");
         codestartTest.checkGeneratedTestSource("org.acme.GreetingResourceTest");
-        codestartTest.checkGeneratedTestSource("org.acme.NativeGreetingResourceIT");
+        codestartTest.checkGeneratedTestSource("org.acme.GreetingResourceIT");
     }
 
 }
diff --git a/...g/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java b/...g/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java
@@ -24,7 +24,7 @@ class RESTEasyReactiveCodestartTest {
     void testContent() throws Throwable {
         codestartTest.checkGeneratedSource("org.acme.ReactiveGreetingResource");
         codestartTest.checkGeneratedTestSource("org.acme.ReactiveGreetingResourceTest");
-        codestartTest.checkGeneratedTestSource("org.acme.NativeReactiveGreetingResourceIT");
+        codestartTest.checkGeneratedTestSource("org.acme.ReactiveGreetingResourceIT");
     }
 
 }
diff --git a/...-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java b/...-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java
@@ -24,7 +24,7 @@ class SpringWebCodestartTest {
     void testContent() throws Throwable {
         codestartTest.checkGeneratedSource("org.acme.GreetingController");
         codestartTest.checkGeneratedTestSource("org.acme.GreetingControllerTest");
-        codestartTest.checkGeneratedTestSource("org.acme.NativeGreetingControllerIT");
+        codestartTest.checkGeneratedTestSource("org.acme.GreetingControllerIT");
     }
 
 }
diff --git a/...artGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceIT.java b/...artGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class GreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...erationTest/generateMavenDefaultJava/src_test_java_org_acme_NativeGreetingResourceIT.java b/...erationTest/generateMavenDefaultJava/src_test_java_org_acme_NativeGreetingResourceIT.java
diff --git a/...rtGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_GreetingResourceIT.java b/...rtGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_GreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class GreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...rationTest/generateMavenResteasyJava/src_test_java_org_acme_NativeGreetingResourceIT.java b/...rationTest/generateMavenResteasyJava/src_test_java_org_acme_NativeGreetingResourceIT.java
diff --git a/...rtGenerationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_BonjourResourceIT.java b/...rtGenerationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_BonjourResourceIT.java
@@ -0,0 +1,9 @@
+package com.andy;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class BonjourResourceIT extends BonjourResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...rationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_NativeBonjourResourceIT.java b/...rationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_NativeBonjourResourceIT.java
@@ -1,9 +1,9 @@
 package com.andy;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
-public class NativeBonjourResourceIT extends BonjourResourceTest {
+@QuarkusIntegrationTest
+public class BonjourResourceIT extends BonjourResourceTest {
 
     // Execute the same tests but in native mode.
-}
+}
diff --git a/...GenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_BonjourResourceIT.kt b/...GenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_BonjourResourceIT.kt
@@ -0,0 +1,6 @@
+package com.andy
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class BonjourResourceIT : BonjourResourceTest()
diff --git a/...tionTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_NativeBonjourResourceIT.kt b/...tionTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_NativeBonjourResourceIT.kt
diff --git a/...enerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_BonjourResourceIT.scala b/...enerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_BonjourResourceIT.scala
@@ -0,0 +1,6 @@
+package com.andy
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class BonjourResourceIT extends BonjourResourceTest
diff --git a/...ionTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_NativeBonjourResourceIT.scala b/...ionTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_NativeBonjourResourceIT.scala
diff --git a/...pshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot b/...pshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
@@ -31,13 +31,13 @@ integration-tests/src/test/java/
 integration-tests/src/test/java/org/
 integration-tests/src/test/java/org/extension/
 integration-tests/src/test/java/org/extension/it/
+integration-tests/src/test/java/org/extension/it/MyExtensionResourceIT.java
 integration-tests/src/test/java/org/extension/it/MyExtensionResourceTest.java
-integration-tests/src/test/java/org/extension/it/NativeMyExtensionResourceIT.java
 pom.xml
 runtime/
 runtime/pom.xml
 runtime/src/
 runtime/src/main/
 runtime/src/main/resources/
 runtime/src/main/resources/META-INF/
-runtime/src/main/resources/META-INF/quarkus-extension.yaml
+runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/...__/RESTEasyCodestartTest/testContent/src_test_java_ilove_quark_us_GreetingResourceIT.java b/...__/RESTEasyCodestartTest/testContent/src_test_java_ilove_quark_us_GreetingResourceIT.java
@@ -0,0 +1,9 @@
+package ilove.quark.us;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class GreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/...TEasyCodestartTest/testContent/src_test_java_ilove_quark_us_NativeGreetingResourceIT.java b/...TEasyCodestartTest/testContent/src_test_java_ilove_quark_us_NativeGreetingResourceIT.java
diff --git a/...__/RESTEasyCodestartTest/testContent/src_test_kotlin_ilove_quark_us_GreetingResourceIT.kt b/...__/RESTEasyCodestartTest/testContent/src_test_kotlin_ilove_quark_us_GreetingResourceIT.kt
@@ -0,0 +1,6 @@
+package ilove.quark.us
+
+import io.quarkus.test.junit.QuarkusIntegrationTest
+
+@QuarkusIntegrationTest
+class GreetingResourceIT : GreetingResourceTest()
diff --git a/...TEasyCodestartTest/testContent/src_test_kotlin_ilove_quark_us_NativeGreetingResourceIT.kt b/...TEasyCodestartTest/testContent/src_test_kotlin_ilove_quark_us_NativeGreetingResourceIT.kt