#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

@@ -10,7 +10,7 @@ import io.ebean.RawSql;
import io.ebean.RawSqlBuilder;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
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.Order;
@@ -45,9 +45,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
assertNotNull(list);
// check also select count(*)
LoggedSqlCollector.start();
LoggedSql.start();
assertThat(query.findCount()).isEqualTo(list.size());
List<String>sql = LoggedSqlCollector.stop();
List<String>sql = LoggedSql.stop();
assertThat(sql.get(0)).startsWith("select count(*) from ( select r.id, r.name from o_customer r");
assertThat(sql.get(0)).doesNotContain("order by");
}
@@ -161,9 +161,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
}
// check also select count(*)
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
List<String>sql = LoggedSqlCollector.stop();
List<String>sql = LoggedSql.stop();
assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o");
assertThat(sql.get(0)).doesNotContain("order by");
}
@@ -196,9 +196,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
}
// check also select count(*)
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
List<String>sql = LoggedSqlCollector.stop();
List<String>sql = LoggedSql.stop();
assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o");
assertThat(sql.get(0)).doesNotContain("order by");
}
@@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql;
import io.ebean.*;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
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.Order;
@@ -161,20 +161,20 @@ public class TestNativeSqlBasic extends BaseTestCase {
List<Order> orders = DB.findNative(Order.class, nativeSql)
.findList();
LoggedSqlCollector.start();
LoggedSql.start();
for (Order order : orders) {
order.getStatus();
}
List<String> sql = LoggedSqlCollector.current();
List<String> sql = LoggedSql.collect();
assertThat(sql).isEmpty();
for (Order order : orders) {
order.getCustomer().getName();
}
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains(" from o_customer t0 where ");
}
@@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql;
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.embedded.EAddress;
import org.tests.model.embedded.EPerson;
@@ -35,7 +35,7 @@ public class TestNativeWithEmbedded extends BaseTestCase {
String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean, jraw from eperson where id = ?";
LoggedSqlCollector.start();
LoggedSql.start();
Query<EPerson> query = DB.findNative(EPerson.class, sql);
query.setParameter(person.getId());
@@ -46,7 +46,7 @@ public class TestNativeWithEmbedded extends BaseTestCase {
assertThat(one.getAddress().getJbean().getName()).isEqualTo("hi");
assertThat(one.getAddress().getJraw().get("a")).isEqualTo("1");
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1);
}
}