#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 org.tests.query.other;
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.converstation.Conversation;
@@ -52,7 +52,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
assertThat(generatedSql).contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?)");
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
// select count(*) from (
@@ -62,7 +62,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
// where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )
// ); --bind(1,true,1,true)
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertEquals(1, loggedSql.size());
String countSql = trimSql(loggedSql.get(0), 0);
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Query;
import org.tests.model.basic.Order;
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;
@@ -25,10 +25,10 @@ public class TestQueryRawExpressionMany extends BaseTestCase {
.where().raw("details.orderQty = ?", quantity)
.query();
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
List<String> sql = LoggedSqlCollector.stop();
List<String> sql = LoggedSql.stop();
assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id and t1.id > 0 where t1.order_qty = ?)");
}
@@ -3,7 +3,7 @@ package org.tests.query.other;
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.Order;
import org.tests.model.basic.ResetBasicData;
@@ -20,7 +20,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
Long productId = 1L;
@@ -64,7 +64,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
// u1.product_id = ?
// ); --bind(1)
List<String> sqlLogged = LoggedSqlCollector.stop();
List<String> sqlLogged = LoggedSql.stop();
assertEquals(list.size(), rowCount);
assertEquals(2, sqlLogged.size());
@@ -89,10 +89,10 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
.orderBy("cretime asc")
.query();
LoggedSqlCollector.start();
LoggedSql.start();
query.findCount();
List<String> sqlLogged = LoggedSqlCollector.stop();
List<String> sqlLogged = LoggedSql.stop();
assertEquals(1, sqlLogged.size());
assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id = ?)");
@@ -2,7 +2,7 @@ package org.tests.query.other;
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.Customer;
import org.tests.model.basic.Order;
@@ -21,13 +21,13 @@ public class TestWhereAnnotation extends BaseTestCase {
ResetBasicData.reset();
LoggedSqlCollector.start();
LoggedSql.start();
DB.find(Customer.class)
.fetch("orders")
.findList();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertEquals(1, loggedSql.size());
@@ -42,7 +42,7 @@ public class TestWhereAnnotation extends BaseTestCase {
DB.cacheManager().clearAll();
LoggedSqlCollector.start();
LoggedSql.start();
List<Customer> customers = DB.find(Customer.class)
.order().asc("id")
@@ -52,7 +52,7 @@ public class TestWhereAnnotation extends BaseTestCase {
assertThat(orders.size()).isGreaterThan(0);
orders.get(0).getStatus();
List<String> loggedSql = LoggedSqlCollector.stop();
List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2);
assertThat(loggedSql.get(1)).contains("t0.order_date is not null");