Merge pull request #16020 from jerboaa/spring-jpa-graal-21.1-dev

Refactor spring-data-jpa integration-test
quarkusio · Mar 25, 2021 · ff70524 · ff70524
2 parents 255500f + b12f825
commit ff70524
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/...tion-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/DataGenerator.java b/...tion-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/DataGenerator.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.Random;
+
+public class DataGenerator {
+
+    public static final Random RANDOM = new Random();
+
+    public static Date randomDate() {
+        return Date.from(LocalDate.now().minusDays(RANDOM.nextInt(3000)).atStartOfDay()
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+    }
+
+    public static int randomAge() {
+        return RANDOM.nextInt(100);
+    }
+
+    public static boolean randomBoolean() {
+        return RANDOM.nextBoolean();
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java
@@ -1,11 +1,8 @@
 package io.quarkus.it.spring.data.jpa;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Random;
 import java.util.Set;
 
 import javax.json.bind.annotation.JsonbDateFormat;
@@ -27,8 +24,6 @@
 @Entity
 public class Person {
 
-    private static final Random RANDOM = new Random();
-
     @Id
     @SequenceGenerator(name = "personSeqGen", sequenceName = "personSeq", initialValue = 100, allocationSize = 1)
     @GeneratedValue(generator = "personSeqGen")
@@ -54,11 +49,9 @@ public class Person {
 
     public Person(String name) {
         this.name = name;
-        this.age = RANDOM.nextInt(100);
-        this.joined = Date.from(LocalDate.now().minusDays(RANDOM.nextInt(3000)).atStartOfDay()
-                .atZone(ZoneId.systemDefault())
-                .toInstant());
-        this.active = RANDOM.nextBoolean();
+        this.age = DataGenerator.randomAge();
+        this.joined = DataGenerator.randomDate();
+        this.active = DataGenerator.randomBoolean();
     }
 
     public Person() {

diff --git a/integration-tests/spring-data-jpa/src/main/resources/application.properties b/integration-tests/spring-data-jpa/src/main/resources/application.properties
@@ -5,6 +5,10 @@ quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
+# DataGenerator uses java.util.Random => needs to be runtime initialized
+# as j.u.Random is prohibited in the native image heap. Otherwise
+# random data becomes deterministic
+quarkus.native.additional-build-args=--initialize-at-run-time=io.quarkus.it.spring.data.jpa.DataGenerator
 #quarkus.hibernate-orm.log.sql=true
 
 %prod.quarkus.hibernate-orm.sql-load-script=import.sql