#374 - Update tests for cross db (order by and too fast)

ebean-orm · Aug 6, 2015 · 8cde0da · 8cde0da
1 parent 14f984e
commit 8cde0da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java b/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java
@@ -20,8 +20,11 @@ public void testLazyOnNonLoaded() {
 
     ResetBasicData.reset();
 
-    Query<Order> query = Ebean.find(Order.class).select("status")
-        .fetch("customer", "+lazy(10) name, status").fetch("customer.contacts");
+    Query<Order> query = Ebean.find(Order.class)
+        .select("status")
+        .fetch("customer", "+lazy(10) name, status")
+        .fetch("customer.contacts")
+        .order().asc("id");
 
     List<Order> list = query.findList();
 

diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java
@@ -70,14 +70,18 @@ public void test_countInBackground() throws ExecutionException, InterruptedExcep
 
 
   @Test
-  public void test_countInBackground_withLoadRowCount() {
+  public void test_countInBackground_withLoadRowCount() throws InterruptedException {
 
     ResetBasicData.reset();
 
     // fetch less that total orders (page size 3)
     PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 3);
 
     LoggedSqlCollector.start();
+    // sleep a little to give the logger registration time
+    // as sometimes the first query executes too fast to
+    // be captured in this multithreaded test
+    Thread.sleep(10);
 
     pagedList.loadRowCount();
     List<Order> orders = pagedList.getList();