#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

@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics;
import org.tests.model.basic.UUOne;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -41,7 +41,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase {
assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne());
assertBeanCacheHits(1);
LoggedSqlCollector.start();
LoggedSql.start();
List<UUOne> list = DB.find(UUOne.class)
.select("id")
@@ -55,7 +55,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase {
}
list.get(0).getName();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("from uuone t0 where t0.name like ");
platformAssertIn(sql.get(1), "from uuone t0 where t0.id");
@@ -5,7 +5,7 @@ import io.ebean.DB;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -21,7 +21,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true)
@@ -35,7 +35,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
List<OrderDetail> details = order.getDetails();
assertEquals(details.size(), 0);
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1);
assertThat(trimSql(loggedSql.get(0), 2)).contains("select t0.id, t0.status, t0.order_date,");
@@ -47,7 +47,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true)
@@ -61,7 +61,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
// normally invokes lazy loading
assertNull(order.getCustomer().getStatus());
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1);
}
@@ -70,7 +70,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true)
@@ -85,7 +85,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
// normally invokes lazy loading
assertNull(order.getCustomer().getStatus());
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1);
}
}
@@ -3,7 +3,7 @@ package org.tests.batchload;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.FetchConfig;
import org.ebeantest.LoggedSqlCollector;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
@@ -25,7 +25,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
// This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class)
@@ -35,7 +35,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(l0).isNotEmpty();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -51,7 +51,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
// This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class)
@@ -62,7 +62,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(l0).isNotEmpty();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -77,7 +77,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
// This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class)
@@ -102,7 +102,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// normally invokes lazy loading
order.getShipments().size();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -117,7 +117,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
// This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class)
@@ -138,7 +138,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(details).isEmpty();
assertThat(details.size()).isEqualTo(0);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
}
@@ -156,7 +156,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
DB.save(tenant);
LoggedSqlCollector.start();
LoggedSql.start();
Tenant found = DB.find(Tenant.class)
.setDisableLazyLoading(true)
@@ -166,7 +166,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(found.getRoles().size()).isEqualTo(0);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
}
@@ -181,7 +181,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
u.getRoles().put("disableLazyLoading", r0);
DB.save(u);
LoggedSqlCollector.start();
LoggedSql.start();
MpUser found = DB.find(MpUser.class)
.setDisableLazyLoading(true)
@@ -193,7 +193,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(found.getRoles().size()).isEqualTo(0);
// only 1 query ... no lazy loading query
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
DB.deleteAll(Arrays.asList(found, r0));
@@ -204,7 +204,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
// This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class)
@@ -225,7 +225,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// normally invokes lazy loading
orderDetail.getShipQty();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1);
String originQuery = trimSql(loggedSql.get(0), 5);
@@ -1,7 +1,7 @@
package org.tests.batchload;
import io.ebean.*;
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;
@@ -19,14 +19,14 @@ public class TestSecondaryQueries extends TransactionalTestCase {
@Test
public void fetchQuery() {
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(Order.class)
.select("status")
.fetchQuery("customer", "name")
.findList();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2);
assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0");
@@ -37,7 +37,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
@Test
public void fetchLazy() {
LoggedSqlCollector.start();
LoggedSql.start();
DB.cacheManager().clearAll();
List<Order> orders = DB.find(Order.class)
@@ -47,7 +47,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.setUseCache(false)
.findList();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
if (isSqlServer()) {
@@ -56,14 +56,14 @@ public class TestSecondaryQueries extends TransactionalTestCase {
assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0");
}
LoggedSqlCollector.start();
LoggedSql.start();
// invoke lazy loading
for (Order order : orders) {
order.getCustomer().getName();
}
sql = LoggedSqlCollector.stop();
sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.name from o_customer t0 where t0.id");
platformAssertIn(sql.get(0), " where t0.id");
@@ -72,7 +72,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
@Test
public void fetchIterate() {
LoggedSqlCollector.start();
LoggedSql.start();
try (QueryIterator<Order> orders =
DB.find(Order.class).select("status")
@@ -84,7 +84,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
orders.next(); // dummy read
}
}
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
if (isSqlServer()) {
@@ -105,12 +105,12 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.fetchQuery("contacts")
.setId(custId);
LoggedSqlCollector.start();
LoggedSql.start();
Customer cust = query.findOne();
assertNotNull(cust);
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
String generatedSql = query.getGeneratedSql();
assertThat(generatedSql).contains("from o_customer t0 where t0.id = ?");
@@ -133,7 +133,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.query();
LoggedSqlCollector.start();
LoggedSql.start();
List<Order> list = query.findList();
assertTrue(!list.isEmpty());
@@ -142,7 +142,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
order.getCustomer().getStatus();
}
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
String generatedSql = sqlOf(query, 2);
//select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW)