mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#2361 - Tidy tests only, move to LoggedSql (ebean-test)
This commit is contained in:
1 parent
e5dceda4b9
commit
1696caadd4
163 files changed
+1024
-1179
No files matched your search
@@ -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);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user