Merge pull request #37458 from gsmet/move-java-17-tests

Move Java 17 records tests to their respective modules
quarkusio · Dec 4, 2023 · f1b034a · f1b034a
2 parents 4ef6171 + 170ad57
commit f1b034a
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 266 deletions.
diff --git a/...s/it/hibernate/panache/person/Person.java → ...anache/deployment/test/record/Person.java b/...s/it/hibernate/panache/person/Person.java → ...anache/deployment/test/record/Person.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.hibernate.panache.person;
+package io.quarkus.hibernate.orm.panache.deployment.test.record;
 
 import jakarta.persistence.Entity;
 

diff --git a/.../hibernate/panache/person/PersonName.java → ...he/deployment/test/record/PersonName.java b/.../hibernate/panache/person/PersonName.java → ...he/deployment/test/record/PersonName.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.hibernate.panache.person;
+package io.quarkus.hibernate.orm.panache.deployment.test.record;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 

diff --git a/...est/java/io/quarkus/hibernate/orm/panache/deployment/test/record/RecordInPanacheTest.java b/...est/java/io/quarkus/hibernate/orm/panache/deployment/test/record/RecordInPanacheTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.record;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import jakarta.transaction.Transactional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class RecordInPanacheTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addAsResource("application-test.properties", "application.properties")
+                    .addClasses(Person.class, PersonName.class, Status.class));
+
+    @Test
+    @Transactional
+    void testRecordInPanache() {
+        var person1 = new Person();
+        person1.firstname = "Loïc";
+        person1.lastname = "Mathieu";
+        person1.status = Status.ALIVE;
+        person1.persist();
+
+        var person2 = new Person();
+        person1.firstname = "Zombie";
+        person2.lastname = "Zombie";
+        person2.status = Status.DEAD;
+        person2.persist();
+
+        assertEquals(2L, Person.count());
+
+    }
+
+    @Test
+    @Transactional
+    void testHqlPanacheProject() {
+        var mark = new Person();
+        mark.firstname = "Mark";
+        mark.lastname = "Mark";
+        mark.persistAndFlush();
+
+        var hqlWithoutSpace = """
+                select
+                    firstname,
+                    lastname
+                from
+                    io.quarkus.hibernate.orm.panache.deployment.test.record.Person
+                where
+                    firstname = ?1
+                """;
+        var persistedWithoutSpace = Person.find(hqlWithoutSpace, "Mark").project(PersonName.class).firstResult();
+        assertEquals("Mark", persistedWithoutSpace.firstname());
+
+        // We need to escape the whitespace in Java otherwise the compiler removes it.
+        var hqlWithSpace = """
+                select\s
+                    firstname,
+                    lastname
+                from
+                    io.quarkus.hibernate.orm.panache.deployment.test.record.Person
+                where
+                    firstname = ?1
+                """;
+        var persistedWithSpace = Person.find(hqlWithSpace, "Mark").project(PersonName.class).firstResult();
+        assertEquals("Mark", persistedWithSpace.firstname());
+    }
+}
diff --git a/...s/it/hibernate/panache/person/Status.java → ...anache/deployment/test/record/Status.java b/...s/it/hibernate/panache/person/Status.java → ...anache/deployment/test/record/Status.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.hibernate.panache.person;
+package io.quarkus.hibernate.orm.panache.deployment.test.record;
 
 public enum Status {
     DEAD("I'm a Zombie"),

diff --git a/integration-tests/java-17/pom.xml b/integration-tests/java-17/pom.xml
diff --git a/...on-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java b/...on-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java
diff --git a/integration-tests/java-17/src/main/resources/application.properties b/integration-tests/java-17/src/main/resources/application.properties
diff --git a/...it/mongodb/panache/person/PersonName.java → ...it/mongodb/panache/record/PersonName.java b/...it/mongodb/panache/person/PersonName.java → ...it/mongodb/panache/record/PersonName.java
@@ -1,7 +1,7 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.record;
 
 import io.quarkus.mongodb.panache.common.ProjectionFor;
 
-@ProjectionFor(Person.class)
+@ProjectionFor(PersonWithRecord.class)
 public record PersonName(String firstName, String lastName) {
 }
diff --git a/...ongodb/panache/person/PersonResource.java → ...ongodb/panache/record/PersonResource.java b/...ongodb/panache/person/PersonResource.java → ...ongodb/panache/record/PersonResource.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.record;
 
 import java.net.URI;
 import java.util.List;
@@ -12,11 +12,11 @@
 public class PersonResource {
     @GET
     public List<PersonName> getPersons() {
-        return Person.findAll().project(PersonName.class).list();
+        return PersonWithRecord.findAll().project(PersonName.class).list();
     }
 
     @POST
-    public Response addPerson(Person person) {
+    public Response addPerson(PersonWithRecord person) {
         person.persist();
         String id = person.id.toString();
         return Response.created(URI.create("/persons/entity/" + id)).build();

diff --git a/...kus/it/mongodb/panache/person/Person.java → ...godb/panache/record/PersonWithRecord.java b/...kus/it/mongodb/panache/person/Person.java → ...godb/panache/record/PersonWithRecord.java
@@ -1,8 +1,8 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.record;
 
 import io.quarkus.mongodb.panache.PanacheMongoEntity;
 
-public class Person extends PanacheMongoEntity {
+public class PersonWithRecord extends PanacheMongoEntity {
     public String firstname;
     public String lastname;
     public Status status = Status.ALIVE;

diff --git a/...kus/it/mongodb/panache/person/Status.java → ...kus/it/mongodb/panache/record/Status.java b/...kus/it/mongodb/panache/person/Status.java → ...kus/it/mongodb/panache/record/Status.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.record;
 
 public enum Status {
     DEAD("I'm a Zombie"),