#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

@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection.ModifyListenMode;
import io.ebean.common.BeanList;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Animal;
import org.tests.model.basic.AnimalShelter;
@@ -61,12 +61,12 @@ public class TestInheritanceOnMany extends BaseTestCase {
dog.setRegistrationNumber("D2");
DB.save(dog);
LoggedSqlCollector.start();
LoggedSql.start();
// Dog is concrete so we return as Dog even though
// it could be a BigDog (so we are trusting the caller)
Dog ref = DB.reference(Dog.class, dog.getId());
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).isEmpty();
assertNotNull(ref);
@@ -82,10 +82,10 @@ public class TestInheritanceOnMany extends BaseTestCase {
bd.setRegistrationNumber("BG2");
DB.save(bd);
LoggedSqlCollector.start();
LoggedSql.start();
BigDog bigDog = DB.reference(BigDog.class, bd.getId());
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).isEmpty();
assertNotNull(bigDog);
@@ -93,11 +93,11 @@ public class TestInheritanceOnMany extends BaseTestCase {
assertEquals("BG2", bigDog.getRegistrationNumber());
LoggedSqlCollector.start();
LoggedSql.start();
// Animal is abstract so we hit the DB
Animal animal = DB.reference(Animal.class, bd.getId());
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertThat(trimSql(sql.get(0), 2)).contains("select t0.species, t0.id from animal t0 where t0.id = ?");
assertNotNull(animal);
@@ -2,8 +2,8 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebeantest.LoggedSql;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.inheritance.order.OrderMasterInheritance;
import org.tests.inheritance.order.OrderedA;
@@ -30,9 +30,9 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
master.getReferenced().add(orderedA);
master.getReferenced().add(orderedB);
LoggedSqlCollector.start();
LoggedSql.start();
DB.save(master);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(5);
// Some platforms insert ids and others don't need to...
assertSql(trimId(sql, 1))
@@ -53,7 +53,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
LoggedSql.start();
DB.save(result);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(3);
assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?");
@@ -3,7 +3,7 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.inherit.ChildA;
import org.tests.inherit.ChildB;
@@ -27,7 +27,7 @@ public class TestInheritanceQuery extends BaseTestCase {
server().save(b2);
LoggedSqlCollector.start();
LoggedSql.start();
Query<Parent> query = DB.find(Parent.class);
@@ -46,7 +46,7 @@ public class TestInheritanceQuery extends BaseTestCase {
query2 = DB.find(Parent.class).setInheritType(ChildB.class);
assertThat(query2.findList()).contains(b1, b2);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(4);
assertSql(sql.get(1)).contains("where t0.type = 'A'");
assertSql(sql.get(2)).contains("where t0.type = 'B'");
@@ -3,7 +3,7 @@ package org.tests.inheritance;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.tests.inherit.ChildA;
import org.tests.inherit.ChildB;
import org.tests.inherit.Parent;
@@ -25,15 +25,15 @@ public class TestInheritanceRefBean extends BaseTestCase {
Parent test;
LoggedSqlCollector.start();
LoggedSql.start();
test = server().reference(ChildA.class, idA);
assertTrue(test instanceof ChildA);
assertEquals(0, LoggedSqlCollector.stop().size());
assertEquals(0, LoggedSql.stop().size());
LoggedSqlCollector.start();
LoggedSql.start();
test = server().reference(Parent.class, idB);
assertTrue(test instanceof ChildB);
assertEquals(1, LoggedSqlCollector.stop().size());
assertEquals(1, LoggedSql.stop().size());
}
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -74,7 +74,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
private void assertFetchAllSourceAs() {
LoggedSqlCollector.start();
LoggedSql.start();
final List<SourceA> sourceAList = DB.find(SourceA.class)
.fetch("target", "name")
@@ -87,7 +87,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
assertThat(joinedNames).isEqualTo("|source a|target 1|source a2|target 1b");
final List<String> sql = LoggedSqlCollector.stop();
final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t1.dtype, t1.id, t1.name from source_base t0 left join target_base t1 on t1.id = t0.target_id and t1.dtype = 'Target1' where t0.dtype = 'SourceA' order by t0.pos");
}
@@ -97,7 +97,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
*/
private void assertFetchAllDoubleLazyLoading() {
LoggedSqlCollector.start();
LoggedSql.start();
final List<SourceBase> sources = DB.find(SourceBase.class).order("pos").findList();
for (SourceBase source : sources) {
@@ -113,7 +113,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
}
}
final List<String> sql = LoggedSqlCollector.stop();
final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(3);
//assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t0.target_id, t0.target_id from source_base t0 order by t0.pos");
@@ -2,7 +2,7 @@ package org.tests.inheritance.cache;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.cache.CInhOne;
import org.tests.model.basic.cache.CInhRef;
@@ -33,32 +33,32 @@ public class TestInheritanceRefCache extends BaseTestCase {
Integer id = ref.getId();
LoggedSqlCollector.start();
LoggedSql.start();
CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root");
// fetch again - from cache (but fetch second bean from cache)
LoggedSqlCollector.start();
LoggedSql.start();
gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(0);
// fetch again - both from cache
LoggedSqlCollector.start();
LoggedSql.start();
gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(0);
}
@@ -84,11 +84,11 @@ public class TestInheritanceRefCache extends BaseTestCase {
ids.add(two.getId());
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from cinh_root");
@@ -97,11 +97,11 @@ public class TestInheritanceRefCache extends BaseTestCase {
DB.find(CInhRoot.class).setUseQueryCache(true).findList();
DB.find(CInhRoot.class).setUseQueryCache(true).findList();
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(0);
}