#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

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
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.model.basic.Contact;
import org.tests.model.basic.Customer;
@@ -35,13 +35,13 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(EUserNoFk.class)
.where().isEmpty("files")
.delete();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
if (isPlatformSupportsDeleteTableAlias()) {
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression;
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.model.basic.Customer;
import org.tests.model.onetoone.album.Cover;
@@ -35,11 +35,11 @@ public class NoopExpressionTest extends BaseExpressionTest {
.where().add(NoopExpression.INSTANCE)
.query();
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and");
}
@@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import io.ebeaninternal.api.SpiQuery;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.OrderDetail;
@@ -532,12 +532,12 @@ public class EqlParserTest extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10");
query.findList();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t1.id, t1.line_1, t1.city from o_customer t0 left join o_address");
assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id)");