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

This commit is contained in:
Rob Bygrave committed 2021-09-09 11:25:04 +12:00
1 parent e5dceda4b9
commit 1696caadd4
163 files changed
+1024 -1179

No files matched your search

@@ -2,7 +2,7 @@ package org.tests.o2m;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -22,7 +22,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase {
account.save();
LoggedSqlCollector.start();
LoggedSql.start();
final OmAccountDBO found = DB.find(OmAccountDBO.class)
.where().eq("name", "one")
@@ -35,7 +35,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase {
assertSame(found, child.getBananaRama());
}
final List<String> sql = LoggedSqlCollector.stop();
final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(1)).contains("select t0.banana_rama_id, t0.id, t0.description, t0.banana_rama_id from om_account_child_dbo t0 where");
}
@@ -2,7 +2,7 @@ package org.tests.o2m;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebeantest.LoggedSql;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
@@ -2,7 +2,7 @@ package org.tests.o2m.jointable;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -27,7 +27,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
initialInsert();
LoggedSqlCollector.start();
LoggedSql.start();
// make m0 dirty ... but no cascade saved?
m0.setFoodPreference("banana");
@@ -36,7 +36,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
DB.save(troop);
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)");
@@ -54,7 +54,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
assertThat(intersectionRows).isEqualTo(2L);
LoggedSqlCollector.current();
LoggedSql.collect();
JtTroop fetchTroop = DB.find(JtTroop.class)
.fetch("monkeys")
.where().idEq(troop.getPid())
@@ -62,14 +62,14 @@ public class TestOneToManyJoinTable extends BaseTestCase {
assertThat(fetchTroop.getMonkeys()).hasSize(2);
sql = LoggedSqlCollector.current();
sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from troop t0 left join troop_monkey t1z_ on t1z_.troop_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?");
assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version");
DB.delete(troop);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from troop_monkey where troop_pid = ?");
assertSql(sql.get(1)).contains("delete from troop where pid=? and version=?");
@@ -90,10 +90,10 @@ public class TestOneToManyJoinTable extends BaseTestCase {
trainer.getMonkeys().add(new JtMonkey("FBet"));
trainer.getMonkeys().add(new JtMonkey("FThe"));
LoggedSqlCollector.start();
LoggedSql.start();
DB.save(trainer);
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(13);
@@ -123,10 +123,10 @@ public class TestOneToManyJoinTable extends BaseTestCase {
assertThat(intersectionRows).isEqualTo(5);
LoggedSqlCollector.current();
LoggedSql.collect();
DB.delete(trainer);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from trainer_monkey where trainer_tid = ?");
assertSql(sql.get(1)).contains("delete from trainer where tid=?");
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.config.dbplatform.IdType;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.o2m.jointable.inheritance.ClassA;
import org.tests.o2m.jointable.inheritance.ClassB;
@@ -30,11 +30,11 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase {
classA.getMonkeys().add(m1);
classB.getMonkeys().add(m2);
LoggedSqlCollector.start();
LoggedSql.start();
DB.saveAll(Arrays.asList(classA, classB));
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(11);
assertSql(sql.get(0)).contains("insert into class_super ");
@@ -3,7 +3,7 @@ package org.tests.o2m.jointable;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -28,7 +28,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
initialInsert();
LoggedSqlCollector.start();
LoggedSql.start();
// make m0 dirty ... but no cascade saved?
m0.setFoodPreference("camera");
@@ -37,7 +37,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
DB.save(troop);
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
@@ -55,7 +55,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
assertThat(intersectionRows).isEqualTo(2);
LoggedSqlCollector.current();
LoggedSql.collect();
JtMonkeyGroup fetchTroop = DB.find(JtMonkeyGroup.class)
.fetch("monkeys")
.where().idEq(troop.getPid())
@@ -63,14 +63,14 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
assertThat(fetchTroop.getMonkeys()).hasSize(2);
sql = LoggedSqlCollector.current();
sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from mkeygroup t0 left join mkeygroup_monkey t1z_ on t1z_.mkeygroup_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?");
assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version");
DB.delete(troop);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from mkeygroup_monkey where mkeygroup_pid = ?");
assertSql(sql.get(1)).contains("delete from mkeygroup where pid=? and version=?");