Tidy tests only - TestDbJson_Jackson3 TestJacksonPlainBean

ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java

@@ -59,20 +59,15 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     LoggedSql.start();
     found.save();
-
-    List<String> sql = LoggedSql.collect();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set name=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set name=?, version=? where id=? and version=?");
 
     found.setName("b1-mod2");
     found.getPlainValue().setName("b");
     // found.getPlainValue().setMarkedDirty(true); // Irrelevant for SOURCE or HASH based mutation detection
 
     found.save();
-
-    sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set name=?, plain_value=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set name=?, plain_value=?, version=? where id=? and version=?");
+    LoggedSql.stop();
 
     final EBasicJsonJackson3 found2 = DB.find(EBasicJsonJackson3.class, bean.getId());
 
@@ -112,20 +107,16 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     LoggedSql.start();
     DB.save(found);
 
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
 
     assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("beanList=null,[name:a]","name=p1-mod,p1","version=2,1");
 
-
     assertThat(DB.getBeanState(found).isDirty()).isFalse();
 
     found.getPlainBean().setName("b");
-
     assertThat(DB.getBeanState(found).isDirty()).isTrue();
 
     state = DB.getBeanState(found);
@@ -138,14 +129,14 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
     LoggedSql.start();
     DB.save(found);
 
-    sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
     // plain_bean=?, no longer included with MD5 dirty detection
-    assertThat(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_list set plain_bean=?, version=? where id=?");
 
     assertThat(EBasicJsonListPersistController.updatedValues.entrySet())
       .extracting(Map.Entry::toString)
       .containsExactlyInAnyOrder("plainBean=name:b,name:a", "version=3,2");
+
+    LoggedSql.stop();
   }
 
   @Test
@@ -210,8 +201,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     LoggedSql.start();
     bean.save();
-    List<String> sql = LoggedSql.collect();
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value=?, plain_value2=?, version=? where id=?");
+    expectedSql(0, "update ebasic_json_jackson3 set plain_value=?, plain_value2=?, version=? where id=?");
 
     bean = DB.find(EBasicJsonJackson3.class, bean.getId());
     LoggedSql.collect(); // ignore the select
@@ -227,9 +217,12 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     bean.getPlainValue2().setName("b2"); // effectively HASH mode mutation detection
     bean.save();
-    sql = LoggedSql.collect();
-    assertThat(sql.get(0)).contains("update ebasic_json_jackson3 set plain_value2=?, version=? where id=? and version=?");
+    expectedSql(0, "update ebasic_json_jackson3 set plain_value2=?, version=? where id=? and version=?");
 
     LoggedSql.stop();
   }
+
+  private void expectedSql(int i, String s) {
+    assertThat(LoggedSql.collect().get(i)).contains(s);
+  }
 }

ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java

@@ -1,11 +1,9 @@
 package org.tests.model.json;
 
 import io.ebean.DB;
-import org.ebeantest.LoggedSqlCollector;
+import io.ebeantest.LoggedSql;
 import org.junit.Test;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestJacksonPlainBean {
@@ -18,7 +16,7 @@ public class TestJacksonPlainBean {
     bean.setAttr("n0");
     DB.save(bean);
 
-    LoggedSqlCollector.start();
+    LoggedSql.start();
     bean.setAttr("n1");
     DB.save(bean);
     expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
@@ -32,14 +30,14 @@ public class TestJacksonPlainBean {
     DB.save(found);
     expectedSql(1, "update ebasic_plain set attr=?, version=? where id=? and version=?");
 
-    LoggedSqlCollector.stop();
+    LoggedSql.stop();
   }
 
   @Test
   public void insertUpdate() {
 
     DB.getDefault();
-    LoggedSqlCollector.start();
+    LoggedSql.start();
 
     PlainBean content = new PlainBean("foo", 42);
     EBasicPlain bean = new EBasicPlain();
@@ -87,11 +85,11 @@ public class TestJacksonPlainBean {
     DB.save(found);
     expectedSql(0, "update ebasic_plain set plain_bean2=?, version=? where id=? and version=?");
 
-    LoggedSqlCollector.stop();
+    LoggedSql.stop();
   }
 
   private void expectedSql(int i, String s) {
-    assertThat(LoggedSqlCollector.current().get(i)).contains(s);
+    assertThat(LoggedSql.collect().get(i)).contains(s);
   }
 
 }