#2361 - Tidy tests only, move to LoggedSql (ebean-test)

ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java

@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
-import org.ebeantest.LoggedSqlCollector;
+import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -18,7 +18,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
   @Test
   public void test() {
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
     SqlUpdate sqlUpdate = DB.sqlUpdate("delete from o_customer where id in (:ids)");
 
@@ -31,7 +31,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase {
     sqlUpdate.execute();
     assertEquals("delete from o_customer where id in (?,?)", sqlUpdate.getGeneratedSql());
 
-    List<String> sql = LoggedSqlCollector.stop();
+    List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(2);
   }
 

ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java

@@ -5,7 +5,7 @@ import io.ebean.DB;
 import io.ebean.SqlUpdate;
 import io.ebean.Transaction;
 import io.ebean.meta.MetaTimedMetric;
-import org.ebeantest.LoggedSqlCollector;
+import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.idkeys.db.AuditLog;
 
@@ -43,7 +43,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
   @Test
   public void testExecute_inTransaction_withBatch() {
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
     try (Transaction transaction = DB.beginTransaction()) {
       transaction.setBatchMode(true);
@@ -61,7 +61,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
       transaction.commit();
     }
 
-    List<String> sql = LoggedSqlCollector.stop();
+    List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(3);
     assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?");
     assertSqlBind(sql, 1, 2);
@@ -70,7 +70,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
   @Test
   public void testExecute_inTransaction_withoutBatch() {
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
     try (Transaction transaction = DB.beginTransaction()) {
       transaction.setBatchMode(false);
@@ -88,7 +88,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase {
       transaction.commit();
     }
 
-    List<String> sql = LoggedSqlCollector.stop();
+    List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(2);
     assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?; -- bind(999999)");
     assertSql(sql.get(1)).contains("update audit_log set description = description where id = ?; -- bind(999998)");

ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java

@@ -2,7 +2,7 @@ package org.tests.update;
 
 import io.ebean.DB;
 import io.ebean.TransactionalTestCase;
-import io.ebeantest.LoggedSql;
+import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java

@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Transaction;
-import org.ebeantest.LoggedSqlCollector;
+import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 
@@ -33,7 +33,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
 
       txn.setUpdateAllLoadedProperties(true);
 
-      LoggedSqlCollector.start();
+      LoggedSql.start();
 
       basic2.setDescription("bbb-mod");
       server.save(basic2, txn);
@@ -44,7 +44,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
 
       txn.commit();
 
-      List<String> loggedSql = LoggedSqlCollector.stop();
+      List<String> loggedSql = LoggedSql.stop();
 
       assertEquals(2, loggedSql.size());
       // all properties in the bean
@@ -70,7 +70,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
 
     assertEquals(2, beans.size());
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
 
     Transaction txn = DB.beginTransaction();
@@ -92,7 +92,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase {
       txn.end();
     }
 
-    List<String> loggedSql = LoggedSqlCollector.stop();
+    List<String> loggedSql = LoggedSql.stop();
 
     assertThat(loggedSql).hasSize(2);
     assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; -- bind(");