From 8801b8d8cacb7b829d162dc0d2ad538fe89aa681 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Jun 2020 16:55:49 +1200
Subject: [PATCH] No effective change - tidy TestQueryFindEach

---
 .../org/tests/query/TestQueryFindEach.java    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/test/java/org/tests/query/TestQueryFindEach.java b/src/test/java/org/tests/query/TestQueryFindEach.java
index 247b77d17..af7d8b6a9 100644
--- a/src/test/java/org/tests/query/TestQueryFindEach.java
+++ b/src/test/java/org/tests/query/TestQueryFindEach.java
@@ -1,17 +1,19 @@
 package org.tests.query;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
+import io.ebean.DB;
 import io.ebean.FetchConfig;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 public class TestQueryFindEach extends BaseTestCase {
 
   @Test
@@ -19,22 +21,20 @@ public class TestQueryFindEach extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getServer(null);
-
-    Query<Customer> query
-      = server.find(Customer.class)
+    Query<Customer> query = DB.find(Customer.class)
       .setAutoTune(false)
-      .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id")
+      .fetch("contacts", new FetchConfig().query(2))
+      .where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
     final AtomicInteger counter = new AtomicInteger(0);
 
     query.findEach(customer -> {
       counter.incrementAndGet();
-      customer.getName();
+      assertNotNull(customer.getName());
     });
 
-    Assert.assertEquals(2, counter.get());
+    assertEquals(2, counter.get());
   }
 
   /**
@@ -45,10 +45,9 @@ public class TestQueryFindEach extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    EbeanServer server = Ebean.getServer(null);
-
-    Query<Customer> query = server.find(Customer.class).setAutoTune(false)
-      .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id")
+    Query<Customer> query = DB.find(Customer.class)
+      .fetch("contacts", new FetchConfig().query(2))
+      .where().gt("id", 0).order("id")
       .setMaxRows(2).query();
 
     final AtomicInteger counter = new AtomicInteger(0);
@@ -60,6 +59,6 @@ public class TestQueryFindEach extends BaseTestCase {
       }
     });
 
-    Assert.assertFalse("Never get here - exception thrown", true);
+    fail("Never get here - exception thrown");
   }
 }