Merge pull request #30501 from ia3andy/fix-panache-codestart-test

Fix HibernateOrmCodestart
quarkusio · Jan 20, 2023 · e28b200 · e28b200
2 parents 15065dd + 277b190
commit e28b200
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 78 deletions.
diff --git a/...ion-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java b/...ion-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java
@@ -31,8 +31,7 @@ public class MyEntity {
 
     public String field;
 }
-{/if}
-{#if input.selected-extensions-ga.contains('io.quarkus:quarkus-hibernate-orm-panache')}
+{#else}
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import javax.persistence.Entity;
 

diff --git a/...sion-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.kt b/...sion-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.kt
diff --git a/...starts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt b/...starts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt
@@ -30,8 +30,7 @@ class MyKotlinEntity {
     var id: Long? = null
     var field: String? = null
 }
-{/if}
-{#if input.selected-extensions-ga.contains('io.quarkus:quarkus-hibernate-orm-panache-kotlin')}
+{#else}
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion
 import javax.persistence.Entity

diff --git a/...ts/quarkus/HibernateOrmCodestartTest.java → ...arts/quarkus/HibernateOrmCodestartIT.java b/...ts/quarkus/HibernateOrmCodestartTest.java → ...arts/quarkus/HibernateOrmCodestartIT.java
@@ -1,30 +1,33 @@
 package io.quarkus.devtools.codestarts.quarkus;
 
 import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language.JAVA;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language.KOTLIN;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest;
 import io.quarkus.maven.dependency.ArtifactKey;
 
-public class HibernateOrmCodestartTest {
+public class HibernateOrmCodestartIT {
 
     @RegisterExtension
     public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder()
             .codestarts("hibernate-orm")
             .extension(ArtifactKey.ga("io.quarkus", "quarkus-jdbc-h2"))
-            .languages(JAVA)
+            .languages(JAVA, KOTLIN)
             .build();
 
     @Test
     void testContent() throws Throwable {
-        codestartTest.checkGeneratedSource("org.acme.MyEntity");
-        codestartTest.checkGeneratedSource(QuarkusCodestartCatalog.Language.KOTLIN, "org.acme.MyKotlinEntity");
+        codestartTest.checkGeneratedSource(JAVA, "org.acme.MyEntity");
+        codestartTest.checkGeneratedSource(KOTLIN, "org.acme.MyKotlinEntity");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(JAVA, "src/main/resources/import.sql");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(KOTLIN, "src/main/resources/import.sql");
     }
 
     @Test
-    void buildAllProjectsForLocalUse() throws Throwable {
+    void testBuild() throws Throwable {
         codestartTest.buildAllProjects();
     }
 }
diff --git a/...kus/HibernateOrmPanacheCodestartTest.java → ...arkus/HibernateOrmPanacheCodestartIT.java b/...kus/HibernateOrmPanacheCodestartTest.java → ...arkus/HibernateOrmPanacheCodestartIT.java
@@ -8,7 +8,7 @@
 import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest;
 import io.quarkus.maven.ArtifactKey;
 
-public class HibernateOrmPanacheCodestartTest {
+public class HibernateOrmPanacheCodestartIT {
 
     @RegisterExtension
     public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder()
@@ -21,10 +21,11 @@ public class HibernateOrmPanacheCodestartTest {
     @Test
     void testContent() throws Throwable {
         codestartTest.checkGeneratedSource("org.acme.MyEntity");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(JAVA, "src/main/resources/import.sql");
     }
 
     @Test
-    void buildAllProjectsForLocalUse() throws Throwable {
+    void testBuild() throws Throwable {
         codestartTest.buildAllProjects();
     }
 }
diff --git a/...bernateOrmPanacheKotlinCodestartTest.java → ...HibernateOrmPanacheKotlinCodestartIT.java b/...bernateOrmPanacheKotlinCodestartTest.java → ...HibernateOrmPanacheKotlinCodestartIT.java
@@ -8,7 +8,7 @@
 import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest;
 import io.quarkus.maven.ArtifactKey;
 
-public class HibernateOrmPanacheKotlinCodestartTest {
+public class HibernateOrmPanacheKotlinCodestartIT {
 
     @RegisterExtension
     public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder()
@@ -21,10 +21,11 @@ public class HibernateOrmPanacheKotlinCodestartTest {
     @Test
     void testContent() throws Throwable {
         codestartTest.checkGeneratedSource("org.acme.MyKotlinEntity");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(KOTLIN, "src/main/resources/import.sql");
     }
 
     @Test
-    void buildAllProjectsForLocalUse() throws Throwable {
+    void testBuild() throws Throwable {
         codestartTest.buildAllProjects();
     }
 }
diff --git a/...rc_main_java_ilove_quark_us_MyEntity.java → ...rc_main_java_ilove_quark_us_MyEntity.java b/...rc_main_java_ilove_quark_us_MyEntity.java → ...rc_main_java_ilove_quark_us_MyEntity.java
diff --git a/...n_kotlin_ilove_quark_us_MyKotlinEntity.kt → ...n_kotlin_ilove_quark_us_MyKotlinEntity.kt b/...n_kotlin_ilove_quark_us_MyKotlinEntity.kt → ...n_kotlin_ilove_quark_us_MyKotlinEntity.kt
@@ -9,7 +9,7 @@ import javax.persistence.Id
  *
  * To use it, get access to a JPA EntityManager via injection.
  *
- * ```kotlin
+ * {@code
  *    @Inject
  *    lateinit var em:EntityManager;
  *
@@ -20,12 +20,12 @@ import javax.persistence.Id
  *
  *         val entities:List<MyKotlinEntity>  = em.createQuery("from MyEntity", MyKotlinEntity::class.java).getResultList()
  *     }
- * ```
+ * }
  */
 @Entity
 class MyKotlinEntity {
     @get:GeneratedValue
     @get:Id
     var id: Long? = null
     var field: String? = null
-}
+}
diff --git a/...resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_resources_import.sql b/...resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_resources_import.sql
@@ -0,0 +1,5 @@
+-- This file allow to write SQL commands that will be emitted in test and dev.
+-- The commands are commented as their support depends of the database
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-1');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-2');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-3');
diff --git a/...rc_main_java_ilove_quark_us_MyEntity.java → ...rc_main_java_ilove_quark_us_MyEntity.java b/...rc_main_java_ilove_quark_us_MyEntity.java → ...rc_main_java_ilove_quark_us_MyEntity.java
diff --git a/...es/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_resources_import.sql b/...es/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_resources_import.sql
@@ -0,0 +1,5 @@
+-- This file allow to write SQL commands that will be emitted in test and dev.
+-- The commands are commented as their support depends of the database
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-1');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-2');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-3');
diff --git a/...eOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt b/...eOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt
@@ -0,0 +1,34 @@
+package ilove.quark.us
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion
+import javax.persistence.Entity
+
+/**
+ * Example JPA entity defined as a Kotlin Panache Entity.
+ * An ID field of Long type is provided, if you want to define your own ID field extends <code>PanacheEntityBase</code> instead.
+ *
+ * This uses the active record pattern, you can also use the repository pattern instead:
+ * .
+ *
+ * Usage (more example on the documentation)
+ *
+ * {@code
+ *
+ *      fun doSomething() {
+ *          val entity1 = MyKotlinEntity();
+ *          entity1.field = "field-1"
+ *          entity1.persist()
+ *
+ *         val entities:List<MyKotlinEntity>  = MyKotlinEntity.listAll()
+ *     }
+ * }
+ */
+@Entity
+class MyKotlinEntity: PanacheEntity() {
+    companion object: PanacheCompanion<MyKotlinEntity> {
+        fun byName(name: String) = list("name", name)
+    }
+
+    lateinit var field: String
+}
diff --git a/...napshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_resources_import.sql b/...napshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_resources_import.sql
@@ -0,0 +1,5 @@
+-- This file allow to write SQL commands that will be emitted in test and dev.
+-- The commands are commented as their support depends of the database
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-1');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-2');
+-- insert into myentity (id, field) values(nextval('hibernate_sequence'), 'field-3');
diff --git a/...rmPanacheKotlinCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt b/...rmPanacheKotlinCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt