From 52aa1a2d910056af1f94d532b3b9bdada3c2c363 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 1 Mar 2022 20:30:49 +1300
Subject: [PATCH] For Multi-jdk build failure - tweak DbMigrationTest, add
 another hack 1 milli sleep

---
 .../dbmigration/DbMigrationTest.java           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 6f015fc70..9c2dc2d6e 100644
--- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -196,7 +196,7 @@ public class DbMigrationTest extends BaseTestCase {
       hist.setId(2);
       hist.setTestString(42L);
       tmpServer.save(hist);
-
+      sleepOneMilli();
       hist = tmpServer.find(EHistory.class).where().eq("testString", 42L).findOne();
       hist.setTestString(45L);
       tmpServer.save(hist);
@@ -213,12 +213,7 @@ public class DbMigrationTest extends BaseTestCase {
       hist2.setTestString2("bar1");
       hist2.setTestString3("baz1");
       tmpServer.save(hist2);
-      try {
-        // bit of a hack for H2HistoryTrigger with JDK 11+ JVMs, probably need more than millis precision for H2 history
-        Thread.sleep(1);
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
+      sleepOneMilli();
       hist2.setTestString("foo2");
       hist2.setTestString2("bar2");
       tmpServer.save(hist2);
@@ -253,6 +248,15 @@ public class DbMigrationTest extends BaseTestCase {
     }
   }
 
+  private void sleepOneMilli() {
+    try {
+      // bit of a hack for H2HistoryTrigger with JDK 11+ JVMs, probably need more than millis precision for H2 history
+      Thread.sleep(1);
+    } catch (InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   private void createHistoryEntities() {
     SqlUpdate update = server().sqlUpdate("insert into migtest_e_history (id, test_string) values (1, '42')");
     assertThat(server().execute(update)).isEqualTo(1);