github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-12 22:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2361 - Tidy tests only, move to LoggedSql (ebean-test)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-test/src/test/java/io/ebean/DtoQuery2Test.java
+9 -9
View File
@@ -2,7 +2,7 @@ package io.ebean;
import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.BasicMetricVisitor;
import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaQueryMetric;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ public class DtoQuery2Test extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
final int expectedCount = server().find(Customer.class).findCount(); final int expectedCount = server().find(Customer.class).findCount();
LoggedSqlCollector.start(); LoggedSql.start();
int counter = 0; int counter = 0;
try (final QueryIterator<DCust> iterator = server().findDto(DCust.class, "select id, name from o_customer where id > :id") try (final QueryIterator<DCust> iterator = server().findDto(DCust.class, "select id, name from o_customer where id > :id")
.setParameter("id", 0) .setParameter("id", 0)
@@ -72,7 +72,7 @@ public class DtoQuery2Test extends BaseTestCase {
assertThat(counter).isEqualTo(expectedCount); assertThat(counter).isEqualTo(expectedCount);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
@@ -81,7 +81,7 @@ public class DtoQuery2Test extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
final int expectedCount = server().find(Customer.class).findCount(); final int expectedCount = server().find(Customer.class).findCount();
LoggedSqlCollector.start(); LoggedSql.start();
try (final Stream<DCust> stream = try (final Stream<DCust> stream =
server() server()
@@ -96,7 +96,7 @@ public class DtoQuery2Test extends BaseTestCase {
assertThat(names.size()).isEqualTo(expectedCount); assertThat(names.size()).isEqualTo(expectedCount);
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
@@ -105,12 +105,12 @@ public class DtoQuery2Test extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
server().findDto(DCust.class, "select id, name from o_customer where id > :id") server().findDto(DCust.class, "select id, name from o_customer where id > :id")
.setParameter("id", 0) .setParameter("id", 0)
.findEach(it -> log.info("got " + it.getId() + " " + it.getName())); .findEach(it -> log.info("got " + it.getId() + " " + it.getName()));
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
@@ -119,7 +119,7 @@ public class DtoQuery2Test extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc")
.setParameter("id", 0) .setParameter("id", 0)
.findEachWhile(customer -> { .findEachWhile(customer -> {
@@ -127,7 +127,7 @@ public class DtoQuery2Test extends BaseTestCase {
return customer.getId() > 3; return customer.getId() > 3;
}); });
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+19 -19
View File
@@ -5,7 +5,7 @@ import io.ebean.annotation.Platform;
import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaQueryMetric;
import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.MetaTimedMetric;
import io.ebean.meta.ServerMetrics; import io.ebean.meta.ServerMetrics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -76,7 +76,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> list = DB.find(Contact.class) List<Contact> list = DB.find(Contact.class)
.select("email, concat(lastName, ISO_WEEK(?)) as lastName") .select("email, concat(lastName, ISO_WEEK(?)) as lastName")
@@ -86,7 +86,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(list).isNotEmpty(); assertThat(list).isNotEmpty();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact"); assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact");
} }
@@ -97,7 +97,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
// //
// ResetBasicData.reset(); // ResetBasicData.reset();
// //
// LoggedSqlCollector.start(); // LoggedSql.start();
// //
// List<Contact> list = DB.find(Contact.class) // List<Contact> list = DB.find(Contact.class)
// .select("email, concat(lastName, ISO_WEEK(:date)) as lastName") // .select("email, concat(lastName, ISO_WEEK(:date)) as lastName")
@@ -108,7 +108,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
// //
// assertThat(list).isNotEmpty(); // assertThat(list).isNotEmpty();
// //
// List<String> sql = LoggedSqlCollector.stop(); // List<String> sql = LoggedSql.stop();
// assertThat(sql).hasSize(2); // assertThat(sql).hasSize(2);
// assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact"); // assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact");
// } // }
@@ -118,7 +118,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
DtoQuery<ContactDto> query = DB.find(Contact.class) DtoQuery<ContactDto> query = DB.find(Contact.class)
// we must explicitly add the id property for DTO query (if we want it) // we must explicitly add the id property for DTO query (if we want it)
@@ -135,7 +135,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getFullName()).isNotNull(); assertThat(dto.getFullName()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name") assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+ " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name"); + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
} }
@@ -145,7 +145,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
DtoQuery<ContactDto2> query = DB.find(Contact.class) DtoQuery<ContactDto2> query = DB.find(Contact.class)
.where().isNotNull("email").order().asc("lastName") .where().isNotNull("email").order().asc("lastName")
@@ -162,7 +162,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getId()).isGreaterThan(0); assertThat(dto.getId()).isGreaterThan(0);
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.id, t0.first_name, t0.last_name"); assertSql(sql.get(0)).contains("select t0.id, t0.first_name, t0.last_name");
} }
@@ -171,7 +171,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
DtoQuery<ContactDto> query = DB.find(Contact.class) DtoQuery<ContactDto> query = DB.find(Contact.class)
.select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
@@ -186,7 +186,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getFullName()).isNotNull(); assertThat(dto.getFullName()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name") assertSql(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+ " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name"); + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
} }
@@ -196,7 +196,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<ContactDto> contactDtos = DB.find(Contact.class).setLabel("emailFullName") List<ContactDto> contactDtos = DB.find(Contact.class).setLabel("emailFullName")
.select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
@@ -209,7 +209,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getFullName()).isNotNull(); assertThat(dto.getFullName()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isSqlServer()) { if (isSqlServer()) {
assertSql(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name") assertSql(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
@@ -226,7 +226,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<ContactDto> contactDtos = DB.find(Contact.class) List<ContactDto> contactDtos = DB.find(Contact.class)
.select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
@@ -240,7 +240,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getEmail()).isNotNull(); assertThat(dto.getEmail()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isSqlServer()) { if (isSqlServer()) {
assertSql(sql.get(0)).contains("select top 10 t0.id, t0.email, " assertSql(sql.get(0)).contains("select top 10 t0.id, t0.email, "
+ concat("t0.last_name", ", ", "t0.first_name") + concat("t0.last_name", ", ", "t0.first_name")
@@ -256,7 +256,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<ContactDto> contactDtos = DB.find(Contact.class) List<ContactDto> contactDtos = DB.find(Contact.class)
.select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").order() .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").order()
@@ -270,7 +270,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getEmail()).isNull(); assertThat(dto.getEmail()).isNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where"); assertSql(sql.get(0)).contains("select " + concat("t0.last_name", ", ", "t0.first_name") + " fullName from contact t0 where");
} }
@@ -279,7 +279,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where() List<ContactTotals> contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where()
.isNotNull("lastName").having().gt("count(*)", 1).order().desc("count(*)").asDto(ContactTotals.class) .isNotNull("lastName").having().gt("count(*)", 1).order().desc("count(*)").asDto(ContactTotals.class)
@@ -292,7 +292,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
assertThat(dto.getTotalCount()).isNotNull(); assertThat(dto.getTotalCount()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?"); assertSql(sql.get(0)).contains("select t0.last_name, count(*) totalCount from contact t0 where t0.last_name is not null group by t0.last_name having count(*) > ?");
} }
ebean-test/src/test/java/io/ebean/DtoQueryTest.java
+5 -5
View File
@@ -5,7 +5,7 @@ import io.ebean.annotation.Platform;
import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.BasicMetricVisitor;
import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaQueryMetric;
import io.ebean.meta.ServerMetrics; import io.ebean.meta.ServerMetrics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -57,12 +57,12 @@ public class DtoQueryTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
server().findDto(DCust.class, "select id, name from o_customer where id > :id") server().findDto(DCust.class, "select id, name from o_customer where id > :id")
.setParameter("id", 0) .setParameter("id", 0)
.findEach(it -> log.info("got " + it.getId() + " " + it.getName())); .findEach(it -> log.info("got " + it.getId() + " " + it.getName()));
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
@@ -71,7 +71,7 @@ public class DtoQueryTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc")
.setParameter("id", 0) .setParameter("id", 0)
.findEachWhile(customer -> { .findEachWhile(customer -> {
@@ -79,7 +79,7 @@ public class DtoQueryTest extends BaseTestCase {
return customer.getId() > 3; return customer.getId() > 3;
}); });
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?");
} }
ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java
+11 -11
View File
@@ -1,6 +1,6 @@
package io.ebean; package io.ebean;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer; import org.tests.model.basic.EBasicVer;
@@ -20,7 +20,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
final EBasicVer bean1 = bean("foo1"); final EBasicVer bean1 = bean("foo1");
final EBasicVer bean2 = bean("foo2"); final EBasicVer bean2 = bean("foo2");
LoggedSqlCollector.start(); LoggedSql.start();
DB.saveAll(bean0, bean1, bean2); DB.saveAll(bean0, bean1, bean2);
@@ -28,7 +28,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
assertNotNull(bean1.getId()); assertNotNull(bean1.getId());
assertNotNull(bean2.getId()); assertNotNull(bean2.getId());
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("insert into e_basicver"); assertThat(loggedSql.get(0)).contains("insert into e_basicver");
assertSqlBind(loggedSql, 1, 3); assertSqlBind(loggedSql, 1, 3);
@@ -52,10 +52,10 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
} }
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.deleteAll(EBasicVer.class, ids); DB.deleteAll(EBasicVer.class, ids);
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id ");
} }
@@ -73,12 +73,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
Database db = DB.getDefault(); Database db = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = db.beginTransaction()) { try (Transaction txn = db.beginTransaction()) {
db.deleteAll(EBasicVer.class, ids, txn); db.deleteAll(EBasicVer.class, ids, txn);
txn.commit(); txn.commit();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id ");
} }
@@ -94,11 +94,11 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
ids.add(someBean.getId()); ids.add(someBean.getId());
} }
LoggedSqlCollector.start(); LoggedSql.start();
DB.deleteAllPermanent(EBasicVer.class, ids); DB.deleteAllPermanent(EBasicVer.class, ids);
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id ");
} }
@@ -117,12 +117,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase {
Database db = DB.getDefault(); Database db = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = db.beginTransaction()) { try (Transaction txn = db.beginTransaction()) {
db.deleteAllPermanent(EBasicVer.class, ids, txn); db.deleteAllPermanent(EBasicVer.class, ids, txn);
txn.commit(); txn.commit();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id ");
} }
ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java
+9 -9
View File
@@ -1,7 +1,7 @@
package io.ebean; package io.ebean;
import org.tests.model.basic.EBasicVer; import org.tests.model.basic.EBasicVer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -18,10 +18,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
DB.save(someBean); DB.save(someBean);
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(EBasicVer.class, someBean.getId()); DB.delete(EBasicVer.class, someBean.getId());
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?");
} }
@@ -33,10 +33,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
DB.save(someBean); DB.save(someBean);
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.deletePermanent(EBasicVer.class, someBean.getId()); DB.deletePermanent(EBasicVer.class, someBean.getId());
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?");
} }
@@ -50,7 +50,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
Transaction txn = server.beginTransaction(); Transaction txn = server.beginTransaction();
try { try {
server.delete(EBasicVer.class, someBean.getId(), txn); server.delete(EBasicVer.class, someBean.getId(), txn);
@@ -58,7 +58,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
} finally { } finally {
txn.end(); txn.end();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?");
} }
@@ -71,7 +71,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
Transaction txn = server.beginTransaction(); Transaction txn = server.beginTransaction();
try { try {
server.deletePermanent(EBasicVer.class, someBean.getId(), txn); server.deletePermanent(EBasicVer.class, someBean.getId(), txn);
@@ -79,7 +79,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase {
} finally { } finally {
txn.end(); txn.end();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?");
} }
ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java
+5 -5
View File
@@ -1,7 +1,7 @@
package io.ebean; package io.ebean;
import org.tests.model.basic.EBasicVer; import org.tests.model.basic.EBasicVer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -18,10 +18,10 @@ public class EbeanServer_deleteTest extends BaseTestCase {
DB.save(someBean); DB.save(someBean);
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(someBean); DB.delete(someBean);
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and ");
} }
@@ -34,7 +34,7 @@ public class EbeanServer_deleteTest extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
Transaction txn = server.beginTransaction(); Transaction txn = server.beginTransaction();
try { try {
server.delete(someBean, txn); server.delete(someBean, txn);
@@ -42,7 +42,7 @@ public class EbeanServer_deleteTest extends BaseTestCase {
} finally { } finally {
txn.end(); txn.end();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and ");
} }
ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java
+5 -5
View File
@@ -1,6 +1,6 @@
package io.ebean; package io.ebean;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
@@ -88,9 +88,9 @@ public class EbeanServer_eqlTest extends BaseTestCase {
} }
// check also select count(*) // check also select count(*)
LoggedSqlCollector.start(); LoggedSql.start();
query.findCount(); query.findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;"); assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;");
} }
@@ -114,9 +114,9 @@ public class EbeanServer_eqlTest extends BaseTestCase {
} }
// check also select count(*) // check also select count(*)
LoggedSqlCollector.start(); LoggedSql.start();
query.findCount(); query.findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;"); assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;");
} }
ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java
+18 -18
View File
@@ -1,6 +1,6 @@
package io.ebean; package io.ebean;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer; import org.tests.model.basic.EBasicVer;
@@ -19,11 +19,11 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
List<EBasicVer> someBeans = beans(3); List<EBasicVer> someBeans = beans(3);
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.saveAll(someBeans); DB.saveAll(someBeans);
// assert // assert
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("insert into e_basicver (");
assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values (");
@@ -33,19 +33,19 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
} }
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.updateAll(someBeans); DB.updateAll(someBeans);
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(3); assertThat(loggedSql).hasSize(3);
assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? ");
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
DB.deleteAll(someBeans); DB.deleteAll(someBeans);
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?");
} }
@@ -57,31 +57,31 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
try (Transaction transaction = server.beginTransaction()) { try (Transaction transaction = server.beginTransaction()) {
transaction.setBatchMode(true); transaction.setBatchMode(true);
LoggedSqlCollector.start(); LoggedSql.start();
for (EBasicVer bean : beans(2)) { for (EBasicVer bean : beans(2)) {
server.save(bean); server.save(bean);
} }
// jdbc batch, no sql yet // jdbc batch, no sql yet
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
server.saveAll(beans(3)); server.saveAll(beans(3));
// still batch, no sql yet // still batch, no sql yet
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
for (EBasicVer bean : beans(2)) { for (EBasicVer bean : beans(2)) {
server.save(bean); server.save(bean);
} }
// still batch, no sql yet // still batch, no sql yet
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
// flush now // flush now
transaction.commit(); transaction.commit();
// and we have our SQL from jdbc batch flush // and we have our SQL from jdbc batch flush
assertThat(LoggedSqlCollector.stop()).isNotEmpty(); assertThat(LoggedSql.stop()).isNotEmpty();
} }
} }
@@ -113,14 +113,14 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = server.beginTransaction()) { try (Transaction txn = server.beginTransaction()) {
server.saveAll(someBeans, txn); server.saveAll(someBeans, txn);
txn.commit(); txn.commit();
} }
// assert // assert
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("insert into e_basicver (");
assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values (");
@@ -130,23 +130,23 @@ public class EbeanServer_saveAllTest extends BaseTestCase {
} }
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = server.beginTransaction()) { try (Transaction txn = server.beginTransaction()) {
server.updateAll(someBeans, txn); server.updateAll(someBeans, txn);
txn.commit(); txn.commit();
} }
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(3); assertThat(loggedSql).hasSize(3);
assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? ");
// act // act
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = server.beginTransaction()) { try (Transaction txn = server.beginTransaction()) {
server.deleteAll(someBeans, txn); server.deleteAll(someBeans, txn);
txn.commit(); txn.commit();
} }
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?");
} }
ebean-test/src/test/java/io/ebean/FetchGroupTest.java
+9 -9
View File
@@ -1,7 +1,7 @@
package io.ebean; package io.ebean;
import io.ebean.service.SpiFetchGroupQuery; import io.ebean.service.SpiFetchGroupQuery;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Address; import org.tests.model.basic.Address;
import org.tests.model.basic.Contact; import org.tests.model.basic.Contact;
@@ -47,10 +47,10 @@ public class FetchGroupTest extends BaseTestCase {
.ilike("name", "rob") .ilike("name", "rob")
.select(fetch); .select(fetch);
LoggedSqlCollector.start(); LoggedSql.start();
query.findList(); query.findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.status from o_customer"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.status from o_customer");
assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from contact"); assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from contact");
@@ -75,10 +75,10 @@ public class FetchGroupTest extends BaseTestCase {
.ilike("name", "rob") .ilike("name", "rob")
.select(fetch); .select(fetch);
LoggedSqlCollector.start(); LoggedSql.start();
query.findList(); query.findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer"); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer");
assertSql(sql.get(1)).contains(" from contact"); assertSql(sql.get(1)).contains(" from contact");
@@ -105,10 +105,10 @@ public class FetchGroupTest extends BaseTestCase {
.ilike("name", "rob") .ilike("name", "rob")
.select(FBCustomer); .select(FBCustomer);
LoggedSqlCollector.start(); LoggedSql.start();
query.findList(); query.findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.id, t1.line_1, t1.line_2, t1.city, t2.code, t2.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id left join o_country t2 on t2.code = t1.country_code "); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.id, t1.line_1, t1.line_2, t1.city, t2.code, t2.name from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id left join o_country t2 on t2.code = t1.country_code ");
} }
@@ -122,7 +122,7 @@ public class FetchGroupTest extends BaseTestCase {
final FetchGroup<Customer> fetchGroup = query.buildFetchGroup(); final FetchGroup<Customer> fetchGroup = query.buildFetchGroup();
LoggedSqlCollector.start(); LoggedSql.start();
Customer.find Customer.find
.query() .query()
@@ -131,7 +131,7 @@ public class FetchGroupTest extends BaseTestCase {
.select(fetchGroup) .select(fetchGroup)
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where"); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where");
} }
ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java
+5 -5
View File
@@ -3,7 +3,7 @@ package io.ebean;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBean;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.converstation.User; import org.tests.model.converstation.User;
@@ -37,10 +37,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
assertThat(beanState.loadedProps()).containsExactly("id", "name"); assertThat(beanState.loadedProps()).containsExactly("id", "name");
LoggedSqlCollector.start(); LoggedSql.start();
user.update(); user.update();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).doesNotContain("email"); assertThat(loggedSql.get(0)).doesNotContain("email");
} }
@@ -114,10 +114,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
updUser.setName("mod occ"); updUser.setName("mod occ");
updUser.markPropertyUnset("version"); updUser.markPropertyUnset("version");
LoggedSqlCollector.start(); LoggedSql.start();
updUser.save(); updUser.save();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("where id=?;"); assertSql(sql.get(0)).contains("where id=?;");
} }
} }
ebean-test/src/test/java/io/ebean/UpdateQueryTest.java
+11 -11
View File
@@ -5,7 +5,7 @@ import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaQueryMetric;
import io.ebean.meta.ServerMetrics; import io.ebean.meta.ServerMetrics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Country; import org.tests.model.basic.Country;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
@@ -55,7 +55,7 @@ public class UpdateQueryTest extends BaseTestCase {
UpdateQuery<Customer> update = server().update(Customer.class); UpdateQuery<Customer> update = server().update(Customer.class);
LoggedSqlCollector.start(); LoggedSql.start();
int rows = update int rows = update
.setRaw("status = status") .setRaw("status = status")
@@ -63,7 +63,7 @@ public class UpdateQueryTest extends BaseTestCase {
.update(); .update();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(rows).isGreaterThan(0); assertThat(rows).isGreaterThan(0);
@@ -81,7 +81,7 @@ public class UpdateQueryTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
int rows = server().find(Customer.class) int rows = server().find(Customer.class)
.where() .where()
@@ -92,7 +92,7 @@ public class UpdateQueryTest extends BaseTestCase {
.update(); .update();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(rows).isEqualTo(0); assertThat(rows).isEqualTo(0);
@@ -103,7 +103,7 @@ public class UpdateQueryTest extends BaseTestCase {
public void query_asUpdate_idIn() { public void query_asUpdate_idIn() {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
int rows = server().find(Customer.class) int rows = server().find(Customer.class)
.where() .where()
@@ -113,7 +113,7 @@ public class UpdateQueryTest extends BaseTestCase {
.setLabel("asUpdateByIds") .setLabel("asUpdateByIds")
.update(); .update();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(rows).isEqualTo(0); assertThat(rows).isEqualTo(0);
@@ -201,7 +201,7 @@ public class UpdateQueryTest extends BaseTestCase {
Country nz = server.reference(Country.class, "NZ"); Country nz = server.reference(Country.class, "NZ");
LoggedSqlCollector.start(); LoggedSql.start();
server.update(Customer.class) server.update(Customer.class)
.set("status", Customer.Status.ACTIVE) .set("status", Customer.Status.ACTIVE)
@@ -211,7 +211,7 @@ public class UpdateQueryTest extends BaseTestCase {
.setMaxRows(100) .setMaxRows(100)
.update(); .update();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("update o_customer set status=? where id in (select t0.id from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where t1.country_code = ? and t0.id > ? limit 100)"); assertSql(sql.get(0)).contains("update o_customer set status=? where id in (select t0.id from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where t1.country_code = ? and t0.id > ? limit 100)");
} }
@@ -221,7 +221,7 @@ public class UpdateQueryTest extends BaseTestCase {
Database server = server(); Database server = server();
LoggedSqlCollector.start(); LoggedSql.start();
server.update(Customer.class) server.update(Customer.class)
.set("status", Customer.Status.ACTIVE) .set("status", Customer.Status.ACTIVE)
@@ -230,7 +230,7 @@ public class UpdateQueryTest extends BaseTestCase {
.setMaxRows(100) .setMaxRows(100)
.update(); .update();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
if (isMySql() || isH2() || isMariaDB()) { if (isMySql() || isH2() || isMariaDB()) {
assertSql(sql.get(0)).contains("update o_customer set status=? where id > ? limit 100"); assertSql(sql.get(0)).contains("update o_customer set status=? where id > ? limit 100");
} else { } else {
ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java
+3 -3
View File
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Contact; import org.tests.model.basic.Contact;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
@@ -35,13 +35,13 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(EUserNoFk.class) DB.find(EUserNoFk.class)
.where().isEmpty("files") .where().isEmpty("files")
.delete(); .delete();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isPlatformSupportsDeleteTableAlias()) { if (isPlatformSupportsDeleteTableAlias()) {
ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java
+3 -3
View File
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.onetoone.album.Cover; import org.tests.model.onetoone.album.Cover;
@@ -35,11 +35,11 @@ public class NoopExpressionTest extends BaseExpressionTest {
.where().add(NoopExpression.INSTANCE) .where().add(NoopExpression.INSTANCE)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
query.findCount(); 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"); assertSql(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and");
} }
ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+3 -3
View File
@@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiQuery;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.OrderDetail; import org.tests.model.basic.OrderDetail;
@@ -532,12 +532,12 @@ public class EqlParserTest extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10"); Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10");
query.findList(); query.findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); 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(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)"); assertSql(sql.get(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id)");
ebean-test/src/test/java/io/ebeantest/CaptureLogger.java
-64
View File
@@ -1,64 +0,0 @@
package io.ebeantest;
import io.ebeaninternal.api.SpiLogger;
import java.util.ArrayList;
import java.util.List;
/**
* Capture the log messages (executed SQL) for testing.
*/
class CaptureLogger implements SpiLogger {
private final SpiLogger wrapped;
private List<String> messages = new ArrayList<>();
private boolean active;
CaptureLogger(SpiLogger wrapped) {
this.wrapped = wrapped;
}
@Override
public boolean isDebug() {
return true;
}
@Override
public boolean isTrace() {
return true;
}
@Override
public void debug(String msg) {
if (active) {
messages.add(msg);
}
wrapped.debug(msg);
}
@Override
public void trace(String msg) {
if (active) {
messages.add(msg);
}
wrapped.trace(msg);
}
List<String> start() {
this.active = true;
return collect();
}
List<String> stop() {
this.active = false;
return collect();
}
List<String> collect() {
List<String> response = messages;
messages = new ArrayList<>();
return response;
}
}
ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java
-22
View File
@@ -1,22 +0,0 @@
package io.ebeantest;
import io.ebeaninternal.api.SpiLogger;
import io.ebeaninternal.api.SpiLoggerFactory;
import io.ebeaninternal.server.logger.DSpiLogger;
import org.slf4j.LoggerFactory;
/**
* Create a logger that captures the SQL and register it for later access in tests.
*/
public class CapturingLoggerFactory implements SpiLoggerFactory {
@Override
public SpiLogger create(String name) {
DSpiLogger logger = new DSpiLogger(LoggerFactory.getLogger(name));
if (name.equals("io.ebean.SQL")) {
return LoggedSql.register(logger);
}
return logger;
}
}
ebean-test/src/test/java/io/ebeantest/LoggedSql.java
-31
View File
@@ -1,31 +0,0 @@
package io.ebeantest;
import io.ebeaninternal.api.SpiLogger;
import io.ebeaninternal.server.logger.DSpiLogger;
import java.util.List;
public class LoggedSql {
private static CaptureLogger sqlLogger;
static SpiLogger register(DSpiLogger logger) {
if (sqlLogger == null) {
sqlLogger = new CaptureLogger(logger);
}
return sqlLogger;
}
public static List<String> start() {
return sqlLogger.start();
}
public static List<String> stop() {
return sqlLogger.stop();
}
public static List<String> collect() {
return sqlLogger.collect();
}
}
ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java
-36
View File
@@ -1,36 +0,0 @@
package org.ebeantest;
import io.ebeantest.LoggedSql;
import java.util.List;
/**
* Helper that can collect the SQL that is logged via SLF4J.
* <p>
* Used {@link #start()} and {@link #stop()} to collect the logged messages that contain the
* executed SQL statements.
* <p>
* Internally this uses a Logback Appender to collect messages for org.avaje.ebean.SQL.
*/
public class LoggedSqlCollector {
/**
* Start collection of the logged SQL statements.
*/
public static List<String> start() {
return LoggedSql.start();
}
/**
* Stop collection of the logged SQL statements return the list of captured messages that contain
* the SQL.
*/
public static List<String> stop() {
return LoggedSql.stop();
}
public static List<String> current() {
return LoggedSql.collect();
}
}
ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java
+10 -10
View File
@@ -5,7 +5,7 @@ import io.ebean.Database;
import io.ebean.DatabaseFactory; import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig; import io.ebean.config.DatabaseConfig;
import io.ebean.config.TenantMode; import io.ebean.config.TenantMode;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -42,25 +42,25 @@ public class MultiTenantPartitionTest extends BaseTestCase {
UserContext.set("rob", "ten_1"); UserContext.set("rob", "ten_1");
LoggedSqlCollector.start(); LoggedSql.start();
MtContent content = new MtContent("first title"); MtContent content = new MtContent("first title");
server.save(content); server.save(content);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertSql(sql.get(0)).contains("insert into mt_content (title, body, when_modified, when_created, version, tenant_id) values (?,?,?,?,?,?)"); assertSql(sql.get(0)).contains("insert into mt_content (title, body, when_modified, when_created, version, tenant_id) values (?,?,?,?,?,?)");
content.setBody("some body"); content.setBody("some body");
server.save(content); server.save(content);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertSql(sql.get(0)).contains("update mt_content set body=?, when_modified=?, version=? where id=? and tenant_id=? and version=?"); assertSql(sql.get(0)).contains("update mt_content set body=?, when_modified=?, version=? where id=? and tenant_id=? and version=?");
server.delete(content); server.delete(content);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=? and version=?"); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=? and version=?");
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
@Test @Test
@@ -71,10 +71,10 @@ public class MultiTenantPartitionTest extends BaseTestCase {
MtContent content = new MtContent("first title"); MtContent content = new MtContent("first title");
server.save(content); server.save(content);
LoggedSqlCollector.start(); LoggedSql.start();
int rows = server.delete(MtContent.class, content.getId()); int rows = server.delete(MtContent.class, content.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");
assertThat(rows).isEqualTo(1); assertThat(rows).isEqualTo(1);
@@ -93,11 +93,11 @@ public class MultiTenantPartitionTest extends BaseTestCase {
List<Long> ids = Arrays.asList(a.getId(), b.getId(), 99998L); List<Long> ids = Arrays.asList(a.getId(), b.getId(), 99998L);
LoggedSqlCollector.start(); LoggedSql.start();
int rows = server.deleteAll(MtContent.class, ids); int rows = server.deleteAll(MtContent.class, ids);
assertThat(rows).isEqualTo(2); assertThat(rows).isEqualTo(2);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?");
} }
ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java
+17 -17
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Address; import org.tests.model.basic.Address;
import org.tests.model.basic.Contact; import org.tests.model.basic.Contact;
@@ -25,7 +25,7 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.setDistinct(true) .setDistinct(true)
@@ -33,7 +33,7 @@ public class TestAggregateFormula extends BaseTestCase {
.order("min(customer) asc nulls last") .order("min(customer) asc nulls last")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select distinct t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name order by min(t0.customer_id) nulls last"); assertSql(sql.get(0)).contains("select distinct t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name order by min(t0.customer_id) nulls last");
assertThat(contacts).isNotEmpty(); assertThat(contacts).isNotEmpty();
@@ -49,13 +49,13 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.select("lastName, min(customer)") .select("lastName, min(customer)")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
assertThat(contacts).isNotEmpty(); assertThat(contacts).isNotEmpty();
@@ -71,7 +71,7 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.select("lastName, min(customer)") .select("lastName, min(customer)")
@@ -83,7 +83,7 @@ public class TestAggregateFormula extends BaseTestCase {
assertNotNull(customer.getName()); assertNotNull(customer.getName());
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where"); assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status from o_customer t0 where");
@@ -100,7 +100,7 @@ public class TestAggregateFormula extends BaseTestCase {
public void minOnManyToOne_withFetchQueryWithJoin() { public void minOnManyToOne_withFetchQueryWithJoin() {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.select("lastName, min(customer)") .select("lastName, min(customer)")
@@ -117,7 +117,7 @@ public class TestAggregateFormula extends BaseTestCase {
} }
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name");
assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status, t1.id, t1.city, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where"); assertSql(sql.get(1)).contains("select t0.id, t0.name, t0.status, t1.id, t1.city, t1.country_code from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id where");
@@ -135,13 +135,13 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.select("status, sum(id)") .select("status, sum(id)")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) from o_order t0 group by t0.status"); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) from o_order t0 group by t0.status");
assertThat(orders).isNotEmpty(); assertThat(orders).isNotEmpty();
@@ -156,13 +156,13 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.select("status, sum(id) as id") .select("status, sum(id) as id")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) id from o_order t0 group by t0.status"); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) id from o_order t0 group by t0.status");
assertThat(orders).isNotEmpty(); assertThat(orders).isNotEmpty();
@@ -177,13 +177,13 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.select("customer, min(cretime)") .select("customer, min(cretime)")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime) from contact t0 group by t0.customer_id"); assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime) from contact t0 group by t0.customer_id");
assertThat(contacts).isNotEmpty(); assertThat(contacts).isNotEmpty();
@@ -194,13 +194,13 @@ public class TestAggregateFormula extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Contact> contacts = DB.find(Contact.class) List<Contact> contacts = DB.find(Contact.class)
.select("customer, min(cretime), max(updtime)") .select("customer, min(cretime), max(updtime)")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime), max(t0.updtime) from contact t0 group by t0.customer_id"); assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime), max(t0.updtime) from contact t0 group by t0.customer_id");
assertThat(contacts).isNotEmpty(); assertThat(contacts).isNotEmpty();
ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.aggregateformula;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Arrays; import java.util.Arrays;
@@ -24,7 +24,7 @@ public class TestAggregateInheritFormula extends BaseTestCase {
DB.saveAll(Arrays.asList(st0, st1, p0, p1)); DB.saveAll(Arrays.asList(st0, st1, p0, p1));
LoggedSqlCollector.start(); LoggedSql.start();
List<IAFPartialSegment> segments = List<IAFPartialSegment> segments =
DB.find(IAFPartialSegment.class) DB.find(IAFPartialSegment.class)
@@ -32,7 +32,7 @@ public class TestAggregateInheritFormula extends BaseTestCase {
.where().eq("segmentIdZat", 108L) .where().eq("segmentIdZat", 108L)
.findList(); .findList();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(segments).hasSize(1); assertThat(segments).hasSize(1);
assertSql(sql.get(0)).contains("select t0.segment_id_zat, min(t0.status_id) from iaf_segment t0 where t0.ptype = 'target' and t0.segment_id_zat = ? group by t0.segment_id_zat"); assertSql(sql.get(0)).contains("select t0.segment_id_zat, min(t0.status_id) from iaf_segment t0 where t0.ptype = 'target' and t0.segment_id_zat = ? group by t0.segment_id_zat");
ebean-test/src/test/java/org/tests/basic/TestFetchId.java
+1 -1
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.FutureIds; import io.ebean.FutureIds;
import io.ebean.Query; import io.ebean.Query;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail; import org.tests.model.basic.OrderDetail;
ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java
+3 -3
View File
@@ -8,7 +8,7 @@ import io.ebean.Query;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic;
@@ -54,7 +54,7 @@ public class TestQueryForUpdate extends BaseTestCase {
try (Transaction transaction = DB.beginTransaction()) { try (Transaction transaction = DB.beginTransaction()) {
LoggedSqlCollector.start(); LoggedSql.start();
EBasic basic0 = DB.find(EBasic.class, basic.getId()); EBasic basic0 = DB.find(EBasic.class, basic.getId());
assertThat(basic0).isNotNull(); assertThat(basic0).isNotNull();
@@ -67,7 +67,7 @@ public class TestQueryForUpdate extends BaseTestCase {
assertThat(basic1).isNotNull(); assertThat(basic1).isNotNull();
assertThat(basic1).isSameAs(basic0); assertThat(basic1).isSameAs(basic0);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
if (isH2() || isPostgres()) { if (isH2() || isPostgres()) {
assertSql(sql.get(0)).contains("from e_basic t0 where t0.id ="); assertSql(sql.get(0)).contains("from e_basic t0 where t0.id =");
ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+5 -5
View File
@@ -7,7 +7,7 @@ import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.config.dbplatform.DbEncrypt;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncrypt;
import org.tests.model.basic.EBasicEncryptRelate; import org.tests.model.basic.EBasicEncryptRelate;
@@ -25,12 +25,12 @@ public class TestEncrypt extends BaseTestCase {
@ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
public void testQueryBind() { public void testQueryBind() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(EBasicEncrypt.class) DB.find(EBasicEncrypt.class)
.where().startsWith("description", "Rob") .where().startsWith("description", "Rob")
.findList(); .findList();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("; --bind(****,Rob%)"); assertThat(loggedSql.get(0)).contains("; --bind(****,Rob%)");
} }
@@ -39,7 +39,7 @@ public class TestEncrypt extends BaseTestCase {
@ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server @ForPlatform({Platform.H2, Platform.SQLSERVER}) // only run this on H2 - PGCrypto not happy on CI server
public void testQueryJoin() { public void testQueryJoin() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(EBasicEncryptRelate.class) DB.find(EBasicEncryptRelate.class)
.where().eq("other.description", "foo") .where().eq("other.description", "foo")
@@ -49,7 +49,7 @@ public class TestEncrypt extends BaseTestCase {
.where().eq("other.description", "foo") .where().eq("other.description", "foo")
.findCount(); .findCount();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2); assertThat(loggedSql).hasSize(2);
assertThat(loggedSql.get(0)).contains("left join e_basicenc t1 on t1.id = t0.other_id"); assertThat(loggedSql.get(0)).contains("left join e_basicenc t1 on t1.id = t0.other_id");
assertThat(loggedSql.get(1)).contains("left join e_basicenc t1 on t1.id = t0.other_id"); assertThat(loggedSql.get(1)).contains("left join e_basicenc t1 on t1.id = t0.other_id");
ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java
+4 -4
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import io.ebean.QueryType; import io.ebean.QueryType;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
import org.tests.model.basic.TOne; import org.tests.model.basic.TOne;
@@ -35,21 +35,21 @@ public class TestQueryAdapter extends BaseTestCase {
Query<TOne> notUsedQuery = DB.find(TOne.class); Query<TOne> notUsedQuery = DB.find(TOne.class);
assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND); assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND);
LoggedSqlCollector.start(); LoggedSql.start();
DB.update(TOne.class) DB.update(TOne.class)
.set("name", "mod") .set("name", "mod")
.where().idEq(o.getId()) .where().idEq(o.getId())
.update(); .update();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertSql(sql.get(0)).contains(" 2=2"); assertSql(sql.get(0)).contains(" 2=2");
DB.find(TOne.class) DB.find(TOne.class)
.where().idEq(o.getId()) .where().idEq(o.getId())
.delete(); .delete();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertSql(sql.get(0)).contains(" 3=3"); assertSql(sql.get(0)).contains(" 3=3");
} }
ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java
+5 -5
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Database; import io.ebean.Database;
import io.ebean.Query; import io.ebean.Query;
import org.tests.model.basic.EBasicClobFetchEager; import org.tests.model.basic.EBasicClobFetchEager;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -35,13 +35,13 @@ public class TestBasicClobFetchEager extends BaseTestCase {
assertThat(sql).contains(expectedSql); assertThat(sql).contains(expectedSql);
LoggedSqlCollector.start(); LoggedSql.start();
// Same as previous query - clob included by default based on annotation // Same as previous query - clob included by default based on annotation
DB.find(EBasicClobFetchEager.class, entity.getId()); DB.find(EBasicClobFetchEager.class, entity.getId());
// Assert query same as previous ... // Assert query same as previous ...
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertEquals(1, loggedSql.size()); assertEquals(1, loggedSql.size());
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
@@ -66,13 +66,13 @@ public class TestBasicClobFetchEager extends BaseTestCase {
assertEquals("initialClobValue", entity.getDescription()); assertEquals("initialClobValue", entity.getDescription());
LoggedSqlCollector.start(); LoggedSql.start();
// Refresh query includes all properties // Refresh query includes all properties
server.refresh(entity); server.refresh(entity);
// Assert all properties fetched in refresh // Assert all properties fetched in refresh
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertEquals(1, loggedSql.size()); assertEquals(1, loggedSql.size());
assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql);
assertEquals("modified", entity.getDescription()); assertEquals("modified", entity.getDescription());
ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import org.tests.model.basic.EBasicClobNoVer; import org.tests.model.basic.EBasicClobNoVer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -53,13 +53,13 @@ public class TestBasicClobNoVer extends BaseTestCase {
assertThat(entity.getDescription()).isEqualTo("initialClobValue"); assertThat(entity.getDescription()).isEqualTo("initialClobValue");
LoggedSqlCollector.start(); LoggedSql.start();
// Refresh query includes all properties // Refresh query includes all properties
DB.refresh(entity); DB.refresh(entity);
// Assert all properties fetched in refresh // Assert all properties fetched in refresh
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob); assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob);
assertThat(entity.getDescription()).isEqualTo("modified"); assertThat(entity.getDescription()).isEqualTo("modified");
ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+24 -24
View File
@@ -13,7 +13,7 @@ import io.ebean.annotation.Transactional;
import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.MetaTimedMetric;
import io.ebean.meta.ServerMetrics; import io.ebean.meta.ServerMetrics;
import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransaction;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.EBasicVer; import org.tests.model.basic.EBasicVer;
@@ -42,7 +42,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
transaction.setBatchMode(true); transaction.setBatchMode(true);
transaction.setLabel("TestBatchInsertFlush.no_cascade"); transaction.setLabel("TestBatchInsertFlush.no_cascade");
LoggedSqlCollector.start(); LoggedSql.start();
TSMaster m = new TSMaster(); TSMaster m = new TSMaster();
m.setName("master1"); m.setName("master1");
@@ -65,7 +65,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
transaction.commit(); transaction.commit();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we get the 2 master inserts first // we get the 2 master inserts first
assertSql(sql.get(0)).contains("insert into t_atable_thatisrelatively"); assertSql(sql.get(0)).contains("insert into t_atable_thatisrelatively");
@@ -95,7 +95,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
@Transactional(batch = PersistBatch.ALL, flushOnQuery = false) @Transactional(batch = PersistBatch.ALL, flushOnQuery = false)
public void transactional_flushOnQueryFalse() { public void transactional_flushOnQueryFalse() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b1"));
DB.save(new EBasicVer("b2")); DB.save(new EBasicVer("b2"));
@@ -103,7 +103,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
// does not trigger JDBC batch with flushOnQuery = false // does not trigger JDBC batch with flushOnQuery = false
DB.find(Customer.class).findCount(); DB.find(Customer.class).findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("select count(*)"); assertSql(sql.get(0)).contains("select count(*)");
} }
@@ -111,7 +111,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
@Transactional(batchSize = 20) @Transactional(batchSize = 20)
public void transactional_flushOnSqlQuery() { public void transactional_flushOnSqlQuery() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b1"));
DB.save(new EBasicVer("b2")); DB.save(new EBasicVer("b2"));
@@ -121,7 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
.mapToScalar(Integer.class) .mapToScalar(Integer.class)
.findOne(); .findOne();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("insert into e_basicver"); assertSql(sql.get(0)).contains("insert into e_basicver");
} }
@@ -129,7 +129,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
@Transactional(batchSize = 20) @Transactional(batchSize = 20)
public void transactional_flushOnDtoQuery() { public void transactional_flushOnDtoQuery() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b1"));
DB.save(new EBasicVer("b2")); DB.save(new EBasicVer("b2"));
@@ -138,7 +138,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
DB.findDto(DtoQuery2Test.DCust.class, "select id, name from o_customer") DB.findDto(DtoQuery2Test.DCust.class, "select id, name from o_customer")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("insert into e_basicver"); assertSql(sql.get(0)).contains("insert into e_basicver");
} }
@@ -146,7 +146,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
@Transactional(batch = PersistBatch.ALL) @Transactional(batch = PersistBatch.ALL)
public void transactional_flushOnQuery() { public void transactional_flushOnQuery() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b1"));
DB.save(new EBasicVer("b2")); DB.save(new EBasicVer("b2"));
@@ -154,7 +154,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
// by default triggers flush of JDBC batch // by default triggers flush of JDBC batch
DB.find(Customer.class).findCount(); DB.find(Customer.class).findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("insert into e_basicver"); assertSql(sql.get(0)).contains("insert into e_basicver");
} }
@@ -164,7 +164,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
public void transactional_flushOnGetId() { public void transactional_flushOnGetId() {
Database server = DB.getDefault(); Database server = DB.getDefault();
LoggedSqlCollector.start(); LoggedSql.start();
EBasicVer b1 = new EBasicVer("b1"); EBasicVer b1 = new EBasicVer("b1");
server.save(b1); server.save(b1);
@@ -173,10 +173,10 @@ public class TestBatchInsertFlush extends BaseTestCase {
server.save(b2); server.save(b2);
//flush here //flush here
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
Integer id = b1.getId(); Integer id = b1.getId();
assertNotNull(id); assertNotNull(id);
assertThat(LoggedSqlCollector.current()).hasSize(3); assertThat(LoggedSql.collect()).hasSize(3);
EBasicVer b3 = new EBasicVer("b3"); EBasicVer b3 = new EBasicVer("b3");
server.save(b3); server.save(b3);
@@ -189,7 +189,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
Transaction txn = server.beginTransaction(); Transaction txn = server.beginTransaction();
try { try {
LoggedSqlCollector.start(); LoggedSql.start();
txn.setBatchMode(true); txn.setBatchMode(true);
EBasicVer b1 = new EBasicVer("b1"); EBasicVer b1 = new EBasicVer("b1");
@@ -199,10 +199,10 @@ public class TestBatchInsertFlush extends BaseTestCase {
server.save(b2, txn); server.save(b2, txn);
//flush here //flush here
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
Integer id = b1.getId(); Integer id = b1.getId();
assertNotNull(id); assertNotNull(id);
assertThat(LoggedSqlCollector.current()).hasSize(3); assertThat(LoggedSql.collect()).hasSize(3);
EBasicVer b3 = new EBasicVer("b3"); EBasicVer b3 = new EBasicVer("b3");
server.save(b3, txn); server.save(b3, txn);
@@ -220,7 +220,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
LoggedSqlCollector.start(); LoggedSql.start();
EBasicVer b1 = new EBasicVer("b1"); EBasicVer b1 = new EBasicVer("b1");
b1.setId(78965); b1.setId(78965);
@@ -230,11 +230,11 @@ public class TestBatchInsertFlush extends BaseTestCase {
b2.setId(78645); b2.setId(78645);
server.save(b2); server.save(b2);
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
// dont flush here // dont flush here
Integer id = b1.getId(); Integer id = b1.getId();
assertNotNull(id); assertNotNull(id);
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
EBasicVer b3 = new EBasicVer("b3"); EBasicVer b3 = new EBasicVer("b3");
server.save(b3); server.save(b3);
@@ -248,7 +248,7 @@ public class TestBatchInsertFlush extends BaseTestCase {
Database server = DB.getDefault(); Database server = DB.getDefault();
Transaction txn = server.beginTransaction(); Transaction txn = server.beginTransaction();
try { try {
LoggedSqlCollector.start(); LoggedSql.start();
txn.setBatchMode(true); txn.setBatchMode(true);
EBasicVer b1 = new EBasicVer("b1"); EBasicVer b1 = new EBasicVer("b1");
@@ -259,17 +259,17 @@ public class TestBatchInsertFlush extends BaseTestCase {
b2.setId(21354); b2.setId(21354);
server.save(b2, txn); server.save(b2, txn);
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
//dont flush here //dont flush here
Integer id = b1.getId(); Integer id = b1.getId();
assertNotNull(id); assertNotNull(id);
assertThat(LoggedSqlCollector.current()).isEmpty(); assertThat(LoggedSql.collect()).isEmpty();
EBasicVer b3 = new EBasicVer("b3"); EBasicVer b3 = new EBasicVer("b3");
server.save(b3, txn); server.save(b3, txn);
txn.commit(); txn.commit();
assertThat(LoggedSqlCollector.current()).hasSize(5); assertThat(LoggedSql.collect()).hasSize(5);
} finally { } finally {
txn.end(); txn.end();
ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
+3 -3
View File
@@ -3,7 +3,7 @@ package org.tests.batchinsert;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.OCachedBean; import org.tests.model.basic.OCachedBean;
@@ -26,7 +26,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase {
list.add(bean); list.add(bean);
} }
LoggedSqlCollector.start(); LoggedSql.start();
Transaction txn = DB.beginTransaction(); Transaction txn = DB.beginTransaction();
try { try {
@@ -39,7 +39,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase {
txn.end(); txn.end();
} }
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("insert into o_cached_bean ("); assertThat(loggedSql.get(0)).contains("insert into o_cached_bean (");
assertThat(loggedSql.get(0)).contains("name) values (?"); assertThat(loggedSql.get(0)).contains("name) values (?");
ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
+3 -3
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.tests.model.basic.UUOne; import org.tests.model.basic.UUOne;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; 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()); assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne());
assertBeanCacheHits(1); assertBeanCacheHits(1);
LoggedSqlCollector.start(); LoggedSql.start();
List<UUOne> list = DB.find(UUOne.class) List<UUOne> list = DB.find(UUOne.class)
.select("id") .select("id")
@@ -55,7 +55,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase {
} }
list.get(0).getName(); list.get(0).getName();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("from uuone t0 where t0.name like "); assertSql(sql.get(0)).contains("from uuone t0 where t0.name like ");
platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); platformAssertIn(sql.get(1), "from uuone t0 where t0.id");
ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java
+7 -7
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail; import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -21,7 +21,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -35,7 +35,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
List<OrderDetail> details = order.getDetails(); List<OrderDetail> details = order.getDetails();
assertEquals(details.size(), 0); assertEquals(details.size(), 0);
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(trimSql(loggedSql.get(0), 2)).contains("select t0.id, t0.status, t0.order_date,"); 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(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -61,7 +61,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
// normally invokes lazy loading // normally invokes lazy loading
assertNull(order.getCustomer().getStatus()); assertNull(order.getCustomer().getStatus());
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
} }
@@ -70,7 +70,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -85,7 +85,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase {
// normally invokes lazy loading // normally invokes lazy loading
assertNull(order.getCustomer().getStatus()); assertNull(order.getCustomer().getStatus());
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
} }
} }
ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java
+15 -15
View File
@@ -3,7 +3,7 @@ package org.tests.batchload;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.FetchConfig; import io.ebean.FetchConfig;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail; import org.tests.model.basic.OrderDetail;
@@ -25,7 +25,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
// This will use 2 SQL queries to build this object graph // This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
@@ -35,7 +35,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(l0).isNotEmpty(); assertThat(l0).isNotEmpty();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2); assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1); String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -51,7 +51,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
// This will use 2 SQL queries to build this object graph // This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
@@ -62,7 +62,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(l0).isNotEmpty(); assertThat(l0).isNotEmpty();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2); assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1); String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -77,7 +77,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
// This will use 2 SQL queries to build this object graph // This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
@@ -102,7 +102,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// normally invokes lazy loading // normally invokes lazy loading
order.getShipments().size(); order.getShipments().size();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2); assertThat(loggedSql).hasSize(2);
String secondaryQuery = trimSql(loggedSql.get(1), 1); String secondaryQuery = trimSql(loggedSql.get(1), 1);
@@ -117,7 +117,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
// This will use 2 SQL queries to build this object graph // This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
@@ -138,7 +138,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(details).isEmpty(); assertThat(details).isEmpty();
assertThat(details.size()).isEqualTo(0); assertThat(details.size()).isEqualTo(0);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
} }
@@ -156,7 +156,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
DB.save(tenant); DB.save(tenant);
LoggedSqlCollector.start(); LoggedSql.start();
Tenant found = DB.find(Tenant.class) Tenant found = DB.find(Tenant.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -166,7 +166,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(found.getRoles().size()).isEqualTo(0); assertThat(found.getRoles().size()).isEqualTo(0);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
} }
@@ -181,7 +181,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
u.getRoles().put("disableLazyLoading", r0); u.getRoles().put("disableLazyLoading", r0);
DB.save(u); DB.save(u);
LoggedSqlCollector.start(); LoggedSql.start();
MpUser found = DB.find(MpUser.class) MpUser found = DB.find(MpUser.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -193,7 +193,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
assertThat(found.getRoles().size()).isEqualTo(0); assertThat(found.getRoles().size()).isEqualTo(0);
// only 1 query ... no lazy loading query // only 1 query ... no lazy loading query
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
DB.deleteAll(Arrays.asList(found, r0)); DB.deleteAll(Arrays.asList(found, r0));
@@ -204,7 +204,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
ResetBasicData.reset(); ResetBasicData.reset();
LoggedSqlCollector.start(); LoggedSql.start();
// This will use 2 SQL queries to build this object graph // This will use 2 SQL queries to build this object graph
List<Order> l0 = DB.find(Order.class) List<Order> l0 = DB.find(Order.class)
@@ -225,7 +225,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// normally invokes lazy loading // normally invokes lazy loading
orderDetail.getShipQty(); orderDetail.getShipQty();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
String originQuery = trimSql(loggedSql.get(0), 5); String originQuery = trimSql(loggedSql.get(0), 5);
ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java
+13 -13
View File
@@ -1,7 +1,7 @@
package org.tests.batchload; package org.tests.batchload;
import io.ebean.*; import io.ebean.*;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
@@ -19,14 +19,14 @@ public class TestSecondaryQueries extends TransactionalTestCase {
@Test @Test
public void fetchQuery() { public void fetchQuery() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(Order.class) DB.find(Order.class)
.select("status") .select("status")
.fetchQuery("customer", "name") .fetchQuery("customer", "name")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0"); 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 @Test
public void fetchLazy() { public void fetchLazy() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.cacheManager().clearAll(); DB.cacheManager().clearAll();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
@@ -47,7 +47,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.setUseCache(false) .setUseCache(false)
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isSqlServer()) { 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"); 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 // invoke lazy loading
for (Order order : orders) { for (Order order : orders) {
order.getCustomer().getName(); order.getCustomer().getName();
} }
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.name from o_customer t0 where t0.id"); 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"); platformAssertIn(sql.get(0), " where t0.id");
@@ -72,7 +72,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
@Test @Test
public void fetchIterate() { public void fetchIterate() {
LoggedSqlCollector.start(); LoggedSql.start();
try (QueryIterator<Order> orders = try (QueryIterator<Order> orders =
DB.find(Order.class).select("status") DB.find(Order.class).select("status")
@@ -84,7 +84,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
orders.next(); // dummy read orders.next(); // dummy read
} }
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isSqlServer()) { if (isSqlServer()) {
@@ -105,12 +105,12 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.fetchQuery("contacts") .fetchQuery("contacts")
.setId(custId); .setId(custId);
LoggedSqlCollector.start(); LoggedSql.start();
Customer cust = query.findOne(); Customer cust = query.findOne();
assertNotNull(cust); assertNotNull(cust);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
String generatedSql = query.getGeneratedSql(); String generatedSql = query.getGeneratedSql();
assertThat(generatedSql).contains("from o_customer t0 where t0.id = ?"); assertThat(generatedSql).contains("from o_customer t0 where t0.id = ?");
@@ -133,7 +133,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> list = query.findList(); List<Order> list = query.findList();
assertTrue(!list.isEmpty()); assertTrue(!list.isEmpty());
@@ -142,7 +142,7 @@ public class TestSecondaryQueries extends TransactionalTestCase {
order.getCustomer().getStatus(); order.getCustomer().getStatus();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
String generatedSql = sqlOf(query, 2); 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) //select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW)
ebean-test/src/test/java/org/tests/cache/TestBeanCache.java
Vendored
+10 -10
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -40,16 +40,16 @@ public class TestBeanCache extends BaseTestCase {
assertNotNull(bean0); assertNotNull(bean0);
// expect to hit the cache, no SQL // expect to hit the cache, no SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertNotNull(bean1); assertNotNull(bean1);
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
// expect to hit the cache, no SQL // expect to hit the cache, no SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertNotNull(bean2); assertNotNull(bean2);
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
} }
@@ -92,7 +92,7 @@ public class TestBeanCache extends BaseTestCase {
beanCache.clear(); beanCache.clear();
beanCache.statistics(true); beanCache.statistics(true);
LoggedSqlCollector.start(); LoggedSql.start();
log.info("All misses (0 of 3) ..."); log.info("All misses (0 of 3) ...");
List<OCachedBean> list = DB.find(OCachedBean.class) List<OCachedBean> list = DB.find(OCachedBean.class)
@@ -102,7 +102,7 @@ public class TestBeanCache extends BaseTestCase {
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
assertBeanCacheHitMiss(0, 3); assertBeanCacheHitMiss(0, 3);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
assertSql(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)"); assertSql(sql.get(0)).contains("from o_cached_bean t0 where t0.id in (?,?,?,?,?)");
@@ -116,7 +116,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(3, 0); assertBeanCacheHitMiss(3, 0);
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(0); // no misses assertThat(sql).hasSize(0); // no misses
// remove a bean so that we get a "partial" hit (2 out of 3 in cache) // remove a bean so that we get a "partial" hit (2 out of 3 in cache)
@@ -130,7 +130,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(2, 1); assertBeanCacheHitMiss(2, 1);
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// fetch the miss from DB // fetch the miss from DB
@@ -149,7 +149,7 @@ public class TestBeanCache extends BaseTestCase {
assertBeanCacheHitMiss(1, 2); assertBeanCacheHitMiss(1, 2);
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// fetch the misses from DB // fetch the misses from DB
ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package org.tests.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Contact; import org.tests.model.basic.Contact;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java
Vendored
+9 -9
View File
@@ -2,7 +2,7 @@ package org.tests.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.OCachedBean; import org.tests.model.basic.OCachedBean;
@@ -29,9 +29,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertNotNull(bean0); assertNotNull(bean0);
// expect to hit the cache, no SQL // expect to hit the cache, no SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertNotNull(bean1); assertNotNull(bean1);
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
@@ -41,9 +41,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertEquals(deleted, 1); assertEquals(deleted, 1);
// expect not to hit the cache, expect SQL // expect not to hit the cache, expect SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertNull(bean2); assertNull(bean2);
assertThat(sql).isNotEmpty(); assertThat(sql).isNotEmpty();
} }
@@ -59,9 +59,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertNotNull(bean0); assertNotNull(bean0);
// expect to hit the cache, no SQL // expect to hit the cache, no SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertNotNull(bean1); assertNotNull(bean1);
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
@@ -71,9 +71,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase {
assertEquals(updated, 1); assertEquals(updated, 1);
// expect not to hit the cache, expect SQL // expect not to hit the cache, expect SQL
LoggedSqlCollector.start(); LoggedSql.start();
OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne(); OCachedBean bean2 = DB.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findOne();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertNotNull(bean2); assertNotNull(bean2);
assertThat(sql).isNotEmpty(); assertThat(sql).isNotEmpty();
assertEquals("updatedName", bean2.getName()); assertEquals("updatedName", bean2.getName());
ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
Vendored
+12 -12
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.FetchGroup; import io.ebean.FetchGroup;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
@@ -26,13 +26,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
loadCustomerBeanCache(); loadCustomerBeanCache();
customerBeanCache.statistics(true); customerBeanCache.statistics(true);
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.fetchCache("customer", "status, name") .fetchCache("customer", "status, name")
.findList(); .findList();
final List<String> sql0 = LoggedSqlCollector.current(); final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(1); assertThat(sql0).hasSize(1);
final ServerCacheStatistics statistics = customerBeanCache.statistics(true); final ServerCacheStatistics statistics = customerBeanCache.statistics(true);
@@ -46,7 +46,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
assertThat(customer.getStatus()).isNotNull(); assertThat(customer.getStatus()).isNotNull();
} }
assertThat(LoggedSqlCollector.stop()).isEmpty(); assertThat(LoggedSql.stop()).isEmpty();
} }
private void loadCustomerBeanCache() { private void loadCustomerBeanCache() {
@@ -66,13 +66,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
customerBeanCache.statistics(true); customerBeanCache.statistics(true);
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.fetchCache("customer") .fetchCache("customer")
.findList(); .findList();
final List<String> sql0 = LoggedSqlCollector.current(); final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(2); assertThat(sql0).hasSize(2);
assertThat(sql0.get(0)).contains(" from o_order "); assertThat(sql0.get(0)).contains(" from o_order ");
assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id "); assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id ");
@@ -86,7 +86,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
assertThat(customer.getStatus()).isNotNull(); assertThat(customer.getStatus()).isNotNull();
} }
assertThat(LoggedSqlCollector.stop()).isEmpty(); assertThat(LoggedSql.stop()).isEmpty();
} }
@Test @Test
@@ -100,7 +100,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
customerBeanCache.statistics(true); customerBeanCache.statistics(true);
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.fetchCache("customer") .fetchCache("customer")
@@ -109,7 +109,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
for (Order order : orders) { for (Order order : orders) {
assertThat(order.getCustomer().getName()).isNotNull(); assertThat(order.getCustomer().getName()).isNotNull();
} }
final List<String> sql0 = LoggedSqlCollector.current(); final List<String> sql0 = LoggedSql.collect();
assertThat(sql0).hasSize(1); assertThat(sql0).hasSize(1);
final ServerCacheStatistics statistics = customerBeanCache.statistics(true); final ServerCacheStatistics statistics = customerBeanCache.statistics(true);
@@ -124,7 +124,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
} }
// assert we hit the DB the second time around // assert we hit the DB the second time around
final List<String> sql1 = LoggedSqlCollector.stop(); final List<String> sql1 = LoggedSql.stop();
assertThat(sql1).hasSize(1); assertThat(sql1).hasSize(1);
assertThat(sql1.get(0)).contains(" from o_customer t0 "); assertThat(sql1.get(0)).contains(" from o_customer t0 ");
@@ -162,7 +162,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
initDataClearCache(); initDataClearCache();
customerBeanCache.statistics(true); customerBeanCache.statistics(true);
LoggedSqlCollector.start(); LoggedSql.start();
List<Order> orders = DB.find(Order.class) List<Order> orders = DB.find(Order.class)
.select(fgCachePartial) .select(fgCachePartial)
@@ -173,7 +173,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true);
assertThat(statistics1.getMissCount()).isEqualTo(2); assertThat(statistics1.getMissCount()).isEqualTo(2);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains(" from o_order "); assertSql(sql.get(0)).contains(" from o_order ");
assertSql(sql.get(1)).contains(" from o_customer "); assertSql(sql.get(1)).contains(" from o_customer ");
ebean-test/src/test/java/org/tests/cache/TestQueryCache.java
Vendored
+17 -17
View File
@@ -6,7 +6,7 @@ import io.ebean.DB;
import io.ebean.ExpressionList; import io.ebean.ExpressionList;
import io.ebean.bean.BeanCollection; import io.ebean.bean.BeanCollection;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
@@ -104,7 +104,7 @@ public class TestQueryCache extends BaseTestCase {
new EColAB("04", "count").save(); new EColAB("04", "count").save();
new EColAB("05", "count").save(); new EColAB("05", "count").save();
LoggedSqlCollector.start(); LoggedSql.start();
int count0 = DB.find(EColAB.class) int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON) .setUseQueryCache(CacheMode.ON)
@@ -118,20 +118,20 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "count") .eq("columnB", "count")
.findCount(); .findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1); assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
// and now, ensure that we hit the database // and now, ensure that we hit the database
LoggedSqlCollector.start(); LoggedSql.start();
int count2 = DB.find(EColAB.class) int count2 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.OFF) .setUseQueryCache(CacheMode.OFF)
.where() .where()
.eq("columnB", "count") .eq("columnB", "count")
.findCount(); .findCount();
assertThat(count2).isEqualTo(count1); assertThat(count2).isEqualTo(count1);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
} }
@@ -139,7 +139,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountDifferentQueries() { public void findCountDifferentQueries() {
LoggedSqlCollector.start(); LoggedSql.start();
int count0 = DB.find(EColAB.class) int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON) .setUseQueryCache(CacheMode.ON)
@@ -153,7 +153,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "def") .eq("columnB", "def")
.findCount(); .findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1); assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(2); // different queries assertThat(sql).hasSize(2); // different queries
@@ -164,7 +164,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountFirstOnThenRecache() { public void findCountFirstOnThenRecache() {
LoggedSqlCollector.start(); LoggedSql.start();
int count0 = DB.find(EColAB.class) int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON) .setUseQueryCache(CacheMode.ON)
@@ -178,7 +178,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "uvw") .eq("columnB", "uvw")
.findCount(); .findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1); assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(2); // try recache as second query - it must fetch it assertThat(sql).hasSize(2); // try recache as second query - it must fetch it
@@ -190,7 +190,7 @@ public class TestQueryCache extends BaseTestCase {
public void findCountFirstRecacheThenOn() { public void findCountFirstRecacheThenOn() {
LoggedSqlCollector.start(); LoggedSql.start();
int count0 = DB.find(EColAB.class) int count0 = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.PUT) .setUseQueryCache(CacheMode.PUT)
@@ -204,7 +204,7 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "xyz") .eq("columnB", "xyz")
.findCount(); .findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(count0).isEqualTo(count1); assertThat(count0).isEqualTo(count1);
assertThat(sql).hasSize(1); // try recache as first query - second "ON" query must fetch it. assertThat(sql).hasSize(1); // try recache as first query - second "ON" query must fetch it.
@@ -263,7 +263,7 @@ public class TestQueryCache extends BaseTestCase {
new EColAB("04", "someId").save(); new EColAB("04", "someId").save();
new EColAB("05", "someId").save(); new EColAB("05", "someId").save();
LoggedSqlCollector.start(); LoggedSql.start();
List<Integer> colA_first = DB.find(EColAB.class) List<Integer> colA_first = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.ON) .setUseQueryCache(CacheMode.ON)
@@ -277,20 +277,20 @@ public class TestQueryCache extends BaseTestCase {
.eq("columnB", "someId") .eq("columnB", "someId")
.findIds(); .findIds();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(colA_first).isSameAs(colA_second); assertThat(colA_first).isSameAs(colA_second);
assertThat(colA_first).hasSize(3); assertThat(colA_first).hasSize(3);
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
// and now, ensure that we hit the database // and now, ensure that we hit the database
LoggedSqlCollector.start(); LoggedSql.start();
colA_second = DB.find(EColAB.class) colA_second = DB.find(EColAB.class)
.setUseQueryCache(CacheMode.PUT) .setUseQueryCache(CacheMode.PUT)
.where() .where()
.eq("columnB", "someId") .eq("columnB", "someId")
.findIds(); .findIds();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
} }
@@ -311,7 +311,7 @@ public class TestQueryCache extends BaseTestCase {
} }
void differentFindCount(Consumer<ExpressionList<EColAB>> q0, Consumer<ExpressionList<EColAB>> q1) { void differentFindCount(Consumer<ExpressionList<EColAB>> q0, Consumer<ExpressionList<EColAB>> q1) {
LoggedSqlCollector.start(); LoggedSql.start();
ExpressionList<EColAB> el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where(); ExpressionList<EColAB> el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
q0.accept(el0); q0.accept(el0);
@@ -321,7 +321,7 @@ public class TestQueryCache extends BaseTestCase {
q1.accept(el1); q1.accept(el1);
el1.findCount(); el1.findCount();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); // different queries assertThat(sql).hasSize(2); // different queries
} }
ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
Vendored
+4 -4
View File
@@ -4,7 +4,7 @@ import io.ebean.DB;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheRegion; import io.ebean.cache.ServerCacheRegion;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public class PersonCacheTests {
addTestData(); addTestData();
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(PersonCacheInfo.class) DB.find(PersonCacheInfo.class)
.select("personId") // do not fetch name .select("personId") // do not fetch name
@@ -70,7 +70,7 @@ public class PersonCacheTests {
assertThat(email.getPersonInfo().getName()).isNotNull(); assertThat(email.getPersonInfo().getName()).isNotNull();
} }
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3);
@@ -91,7 +91,7 @@ public class PersonCacheTests {
assertThat(email.getPersonInfo().getName()).isNotNull(); assertThat(email.getPersonInfo().getName()).isNotNull();
} }
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3);
ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -45,10 +45,10 @@ public class TestMultiCascadeBatch extends BaseTestCase {
grandparent.setChildren(Collections.singletonList(parent)); grandparent.setChildren(Collections.singletonList(parent));
parent.setChildren(Collections.singletonList(child)); parent.setChildren(Collections.singletonList(child));
LoggedSqlCollector.start(); LoggedSql.start();
grandparent.save(); grandparent.save();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
final List<Site> list = DB.find(Site.class).where() final List<Site> list = DB.find(Site.class).where()
.idIn(grandparent.getId(), parent.getId(), child.getId()) .idIn(grandparent.getId(), parent.getId(), child.getId())
ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java
+10 -10
View File
@@ -2,7 +2,7 @@ package org.tests.cascade;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Collections; import java.util.Collections;
@@ -22,10 +22,10 @@ public class TestOrderedList extends BaseTestCase {
details.add(new OmOrderedDetail("d"+i)); details.add(new OmOrderedDetail("d"+i));
} }
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(master); DB.save(master);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql.size()).isGreaterThan(1); assertThat(sql.size()).isGreaterThan(1);
assertSql(sql.get(0)).contains("insert into om_ordered_master"); assertSql(sql.get(0)).contains("insert into om_ordered_master");
boolean hasId = sql.get(1).contains(" (id, name"); boolean hasId = sql.get(1).contains(" (id, name");
@@ -38,14 +38,14 @@ public class TestOrderedList extends BaseTestCase {
// update without any changes // update without any changes
DB.save(master); DB.save(master);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
// update just changing master // update just changing master
master.setName("m1-mod"); master.setName("m1-mod");
DB.save(master); DB.save(master);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?"); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
@@ -57,12 +57,12 @@ public class TestOrderedList extends BaseTestCase {
OmOrderedMaster fresh = DB.find(OmOrderedMaster.class).setId(id).fetch("details").findOne(); OmOrderedMaster fresh = DB.find(OmOrderedMaster.class).setId(id).fetch("details").findOne();
List<OmOrderedDetail> details1 = fresh.getDetails(); List<OmOrderedDetail> details1 = fresh.getDetails();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertSql(sql.get(0)).contains("order by t0.id, t1.sort_order"); assertSql(sql.get(0)).contains("order by t0.id, t1.sort_order");
// fetched, not dirty // fetched, not dirty
DB.save(fresh); DB.save(fresh);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
@@ -76,7 +76,7 @@ public class TestOrderedList extends BaseTestCase {
DB.save(fresh); DB.save(fresh);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?"); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
assertSql(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?"); assertSql(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
@@ -85,7 +85,7 @@ public class TestOrderedList extends BaseTestCase {
fresh.setName("m1-mod3"); fresh.setName("m1-mod3");
DB.save(fresh); DB.save(fresh);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=? where id=? and version=?; -- bind(m1-mod3"); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=? where id=? and version=?; -- bind(m1-mod3");
assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?"); assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
@@ -93,7 +93,7 @@ public class TestOrderedList extends BaseTestCase {
DB.delete(fresh); DB.delete(fresh);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?"); assertSql(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?");
assertSqlBind(sql.get(1)); assertSqlBind(sql.get(1));
ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java
+5 -5
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.bean.BeanCollection; import io.ebean.bean.BeanCollection;
import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSDetail;
import org.tests.model.basic.TSMaster; import org.tests.model.basic.TSMaster;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -66,11 +66,11 @@ public class TestPrivateOwned extends BaseTestCase {
DB.save(m0); DB.save(m0);
assertThat(m0.getDetails()).hasSize(2); assertThat(m0.getDetails()).hasSize(2);
LoggedSqlCollector.start(); LoggedSql.start();
m0.getDetails().remove(0); m0.getDetails().remove(0);
DB.save(m0); DB.save(m0);
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(2); assertThat(loggedSql).hasSize(2);
assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?"); assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?");
assertSqlBind(loggedSql.get(1)); assertSqlBind(loggedSql.get(1));
@@ -78,9 +78,9 @@ public class TestPrivateOwned extends BaseTestCase {
TSMaster masterReload = DB.find(TSMaster.class, m0.getId()); TSMaster masterReload = DB.find(TSMaster.class, m0.getId());
assertThat(masterReload.getDetails()).hasSize(1); assertThat(masterReload.getDetails()).hasSize(1);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(m0); DB.save(m0);
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(0); assertThat(loggedSql).hasSize(0);
} }
ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java
+1 -1
View File
@@ -9,7 +9,7 @@ import io.ebean.annotation.ChangeLog;
import io.ebean.config.DatabaseConfig; import io.ebean.config.DatabaseConfig;
import io.ebean.event.BeanPersistRequest; import io.ebean.event.BeanPersistRequest;
import io.ebean.event.changelog.*; import io.ebean.event.changelog.*;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java
+5 -5
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -75,10 +75,10 @@ public class TestForeignKeyModes extends BaseTestCase {
assertThat(found.getOnes()).isNotNull(); assertThat(found.getOnes()).isNotNull();
assertThat(found.getOnes()).hasSize(0); assertThat(found.getOnes()).hasSize(0);
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(none); DB.delete(none);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("delete from dfk_none_via_mto_m_dfk_one where dfk_none_via_mto_m_id = ?"); assertSql(sql.get(0)).contains("delete from dfk_none_via_mto_m_dfk_one where dfk_none_via_mto_m_id = ?");
assertSqlBind(sql.get(1)); assertSqlBind(sql.get(1));
@@ -118,10 +118,10 @@ public class TestForeignKeyModes extends BaseTestCase {
DB.save(one); DB.save(one);
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(one); DB.delete(one);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("delete from dfk_cascade_one where id=?"); assertSql(sql.get(0)).contains("delete from dfk_cascade_one where id=?");
ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.defaultvalues;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -21,9 +21,9 @@ public class TestDefaults extends BaseTestCase {
main.getRelatedModels().add(ref); main.getRelatedModels().add(ref);
} }
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(main); DB.save(main);
final List<String> current = LoggedSqlCollector.current(); final List<String> current = LoggedSql.collect();
assertThat(current).isNotEmpty(); assertThat(current).isNotEmpty();
if (isMySql() || isMariaDB()) { if (isMySql() || isMariaDB()) {
ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java
+19 -19
View File
@@ -7,7 +7,7 @@ import io.ebean.Query;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.BBookmarkUser; import org.tests.model.basic.BBookmarkUser;
import org.tests.model.basic.Contact; import org.tests.model.basic.Contact;
@@ -34,7 +34,7 @@ public class TestDeleteByQuery extends BaseTestCase {
createUser("deleteWithLimit3"); createUser("deleteWithLimit3");
createUser("deleteWithLimit4"); createUser("deleteWithLimit4");
LoggedSqlCollector.start(); LoggedSql.start();
final int rows = DB.find(BBookmarkUser.class) final int rows = DB.find(BBookmarkUser.class)
.where().startsWith("name", "deleteWithLimit") .where().startsWith("name", "deleteWithLimit")
.setMaxRows(3) .setMaxRows(3)
@@ -42,7 +42,7 @@ public class TestDeleteByQuery extends BaseTestCase {
assertThat(rows).isEqualTo(3); assertThat(rows).isEqualTo(3);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isSqlServer()) { if (isSqlServer()) {
assertSql(sql.get(0)).contains("delete from bbookmark_user where id in (select top 3 t0.id from bbookmark_user t0 where t0.name like "); assertSql(sql.get(0)).contains("delete from bbookmark_user where id in (select top 3 t0.id from bbookmark_user t0 where t0.name like ");
} else { } else {
@@ -74,20 +74,20 @@ public class TestDeleteByQuery extends BaseTestCase {
.where().eq("org.name", "NahYeahMaybe") .where().eq("org.name", "NahYeahMaybe")
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
query.delete(); query.delete();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(trimSql(loggedSql.get(0), 1)).contains("delete from bbookmark_user where id in (select t0.id from bbookmark_user t0 left join bbookmark_org t1 on t1.id = t0.org_id where t1.name"); assertThat(trimSql(loggedSql.get(0), 1)).contains("delete from bbookmark_user where id in (select t0.id from bbookmark_user t0 left join bbookmark_org t1 on t1.id = t0.org_id where t1.name");
Query<BBookmarkUser> query2 = server.find(BBookmarkUser.class) Query<BBookmarkUser> query2 = server.find(BBookmarkUser.class)
.where().eq("name", "NotARealFirstName").query(); .where().eq("name", "NotARealFirstName").query();
LoggedSqlCollector.start(); LoggedSql.start();
query2.delete(); query2.delete();
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
if (isPlatformSupportsDeleteTableAlias()) { if (isPlatformSupportsDeleteTableAlias()) {
assertThat(loggedSql.get(0)).contains("delete from bbookmark_user t0 where t0.name ="); assertThat(loggedSql.get(0)).contains("delete from bbookmark_user t0 where t0.name =");
@@ -114,19 +114,19 @@ public class TestDeleteByQuery extends BaseTestCase {
Query<Contact> query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query(); Query<Contact> query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query();
LoggedSqlCollector.start(); LoggedSql.start();
query.delete(); query.delete();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(trimSql(loggedSql.get(0), 1)).contains("select t0.id from contact t0 left join contact_group t1 on t1.id = t0.group_id where t1.name = ?"); assertThat(trimSql(loggedSql.get(0), 1)).contains("select t0.id from contact t0 left join contact_group t1 on t1.id = t0.group_id where t1.name = ?");
Query<Contact> query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query(); Query<Contact> query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query();
LoggedSqlCollector.start(); LoggedSql.start();
query2.delete(); query2.delete();
loggedSql = LoggedSqlCollector.stop(); loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(1); assertThat(loggedSql).hasSize(1);
assertThat(loggedSql.get(0)).contains("select t0.id from contact t0 where t0.first_name = ?"); assertThat(loggedSql.get(0)).contains("select t0.id from contact t0 where t0.first_name = ?");
@@ -141,12 +141,12 @@ public class TestDeleteByQuery extends BaseTestCase {
@Test @Test
public void queryByIdDelete() { public void queryByIdDelete() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(BBookmarkUser.class).where().eq("id", 7000).delete(); DB.find(BBookmarkUser.class).where().eq("id", 7000).delete();
DB.find(BBookmarkUser.class).setId(7000).delete(); DB.find(BBookmarkUser.class).setId(7000).delete();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPlatformSupportsDeleteTableAlias()) { if (isPlatformSupportsDeleteTableAlias()) {
assertSql(sql.get(0)).contains("delete from bbookmark_user t0 where t0.id = ?"); assertSql(sql.get(0)).contains("delete from bbookmark_user t0 where t0.id = ?");
assertSql(sql.get(1)).contains("delete from bbookmark_user t0 where t0.id = ?"); assertSql(sql.get(1)).contains("delete from bbookmark_user t0 where t0.id = ?");
@@ -162,12 +162,12 @@ public class TestDeleteByQuery extends BaseTestCase {
@Test @Test
public void queryByIdDelete_withEscalation() { public void queryByIdDelete_withEscalation() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(Contact.class).where().eq("id", 7000).delete(); DB.find(Contact.class).where().eq("id", 7000).delete();
DB.find(Contact.class).setId(7000).delete(); DB.find(Contact.class).setId(7000).delete();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// escalate to fetch ids then delete ... but no rows found // escalate to fetch ids then delete ... but no rows found
assertSql(sql.get(0)).contains("select t0.id from contact t0 where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id from contact t0 where t0.id = ?");
assertSql(sql.get(1)).contains("select t0.id from contact t0 where t0.id = ?"); assertSql(sql.get(1)).contains("select t0.id from contact t0 where t0.id = ?");
@@ -179,7 +179,7 @@ public class TestDeleteByQuery extends BaseTestCase {
@Test @Test
public void queryDelete_withTransactionNoCascade() { public void queryDelete_withTransactionNoCascade() {
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction transaction = DB.beginTransaction()) { try (Transaction transaction = DB.beginTransaction()) {
transaction.setPersistCascade(false); transaction.setPersistCascade(false);
@@ -189,7 +189,7 @@ public class TestDeleteByQuery extends BaseTestCase {
transaction.commit(); transaction.commit();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPlatformSupportsDeleteTableAlias()) { if (isPlatformSupportsDeleteTableAlias()) {
assertSql(sql.get(0)).contains("delete from contact t0 where t0.id = ?"); assertSql(sql.get(0)).contains("delete from contact t0 where t0.id = ?");
} else if (!isMySql()){ } else if (!isMySql()){
@@ -200,14 +200,14 @@ public class TestDeleteByQuery extends BaseTestCase {
@Test @Test
public void testWithForUpdate() { public void testWithForUpdate() {
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(Customer.class) DB.find(Customer.class)
.where().eq("name", "Don Roberto") .where().eq("name", "Don Roberto")
.query().forUpdate() .query().forUpdate()
.delete(); .delete();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isSqlServer()) { if (isSqlServer()) {
assertSql(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?"); assertSql(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?");
ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.delete;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -23,10 +23,10 @@ public class TestDeleteCascadeWithListener extends BaseTestCase {
DcMaster found = DB.find(DcMaster.class, m0.getId()); DcMaster found = DB.find(DcMaster.class, m0.getId());
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(found); DB.delete(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(6); assertThat(sql).hasSize(6);
assertSql(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?"); assertSql(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?");
ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Database; import io.ebean.Database;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.draftable.Doc; import org.tests.model.draftable.Doc;
import org.tests.model.draftable.Link; import org.tests.model.draftable.Link;
@@ -34,12 +34,12 @@ public class DocLinkTest extends BaseTestCase {
assertThat(link).isNotNull(); assertThat(link).isNotNull();
LoggedSqlCollector.start(); LoggedSql.start();
// no lazy loading is invoked as draft property considered @Transient // no lazy loading is invoked as draft property considered @Transient
assertThat(link.isDraft()).isFalse(); assertThat(link.isDraft()).isFalse();
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).isEmpty(); assertThat(loggedSql).isEmpty();
} }
ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java
+1 -1
View File
@@ -8,7 +8,7 @@ import io.ebean.Transaction;
import io.ebean.Version; import io.ebean.Version;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java
+7 -7
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.bean.BeanCollection.ModifyListenMode;
import io.ebean.common.BeanList; import io.ebean.common.BeanList;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Animal; import org.tests.model.basic.Animal;
import org.tests.model.basic.AnimalShelter; import org.tests.model.basic.AnimalShelter;
@@ -61,12 +61,12 @@ public class TestInheritanceOnMany extends BaseTestCase {
dog.setRegistrationNumber("D2"); dog.setRegistrationNumber("D2");
DB.save(dog); DB.save(dog);
LoggedSqlCollector.start(); LoggedSql.start();
// Dog is concrete so we return as Dog even though // Dog is concrete so we return as Dog even though
// it could be a BigDog (so we are trusting the caller) // it could be a BigDog (so we are trusting the caller)
Dog ref = DB.reference(Dog.class, dog.getId()); Dog ref = DB.reference(Dog.class, dog.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
assertNotNull(ref); assertNotNull(ref);
@@ -82,10 +82,10 @@ public class TestInheritanceOnMany extends BaseTestCase {
bd.setRegistrationNumber("BG2"); bd.setRegistrationNumber("BG2");
DB.save(bd); DB.save(bd);
LoggedSqlCollector.start(); LoggedSql.start();
BigDog bigDog = DB.reference(BigDog.class, bd.getId()); BigDog bigDog = DB.reference(BigDog.class, bd.getId());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
assertNotNull(bigDog); assertNotNull(bigDog);
@@ -93,11 +93,11 @@ public class TestInheritanceOnMany extends BaseTestCase {
assertEquals("BG2", bigDog.getRegistrationNumber()); assertEquals("BG2", bigDog.getRegistrationNumber());
LoggedSqlCollector.start(); LoggedSql.start();
// Animal is abstract so we hit the DB // Animal is abstract so we hit the DB
Animal animal = DB.reference(Animal.class, bd.getId()); Animal animal = DB.reference(Animal.class, bd.getId());
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(trimSql(sql.get(0), 2)).contains("select t0.species, t0.id from animal t0 where t0.id = ?"); assertThat(trimSql(sql.get(0), 2)).contains("select t0.species, t0.id from animal t0 where t0.id = ?");
assertNotNull(animal); assertNotNull(animal);
ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java
+5 -5
View File
@@ -2,8 +2,8 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderMasterInheritance;
import org.tests.inheritance.order.OrderedA; import org.tests.inheritance.order.OrderedA;
@@ -30,9 +30,9 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
master.getReferenced().add(orderedA); master.getReferenced().add(orderedA);
master.getReferenced().add(orderedB); master.getReferenced().add(orderedB);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(master); DB.save(master);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(5); assertThat(sql).hasSize(5);
// Some platforms insert ids and others don't need to... // Some platforms insert ids and others don't need to...
assertSql(trimId(sql, 1)) assertSql(trimId(sql, 1))
@@ -53,7 +53,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase {
LoggedSql.start(); LoggedSql.start();
DB.save(result); DB.save(result);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?"); assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?");
ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java
+3 -3
View File
@@ -3,7 +3,7 @@ package org.tests.inheritance;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.inherit.ChildA; import org.tests.inherit.ChildA;
import org.tests.inherit.ChildB; import org.tests.inherit.ChildB;
@@ -27,7 +27,7 @@ public class TestInheritanceQuery extends BaseTestCase {
server().save(b2); server().save(b2);
LoggedSqlCollector.start(); LoggedSql.start();
Query<Parent> query = DB.find(Parent.class); Query<Parent> query = DB.find(Parent.class);
@@ -46,7 +46,7 @@ public class TestInheritanceQuery extends BaseTestCase {
query2 = DB.find(Parent.class).setInheritType(ChildB.class); query2 = DB.find(Parent.class).setInheritType(ChildB.class);
assertThat(query2.findList()).contains(b1, b2); assertThat(query2.findList()).contains(b1, b2);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(1)).contains("where t0.type = 'A'"); assertSql(sql.get(1)).contains("where t0.type = 'A'");
assertSql(sql.get(2)).contains("where t0.type = 'B'"); assertSql(sql.get(2)).contains("where t0.type = 'B'");
ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java
+5 -5
View File
@@ -3,7 +3,7 @@ package org.tests.inheritance;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.tests.inherit.ChildA; import org.tests.inherit.ChildA;
import org.tests.inherit.ChildB; import org.tests.inherit.ChildB;
import org.tests.inherit.Parent; import org.tests.inherit.Parent;
@@ -25,15 +25,15 @@ public class TestInheritanceRefBean extends BaseTestCase {
Parent test; Parent test;
LoggedSqlCollector.start(); LoggedSql.start();
test = server().reference(ChildA.class, idA); test = server().reference(ChildA.class, idA);
assertTrue(test instanceof ChildA); assertTrue(test instanceof ChildA);
assertEquals(0, LoggedSqlCollector.stop().size()); assertEquals(0, LoggedSql.stop().size());
LoggedSqlCollector.start(); LoggedSql.start();
test = server().reference(Parent.class, idB); test = server().reference(Parent.class, idB);
assertTrue(test instanceof ChildB); assertTrue(test instanceof ChildB);
assertEquals(1, LoggedSqlCollector.stop().size()); assertEquals(1, LoggedSql.stop().size());
} }
ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java
+5 -5
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Database; import io.ebean.Database;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -74,7 +74,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
private void assertFetchAllSourceAs() { private void assertFetchAllSourceAs() {
LoggedSqlCollector.start(); LoggedSql.start();
final List<SourceA> sourceAList = DB.find(SourceA.class) final List<SourceA> sourceAList = DB.find(SourceA.class)
.fetch("target", "name") .fetch("target", "name")
@@ -87,7 +87,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
assertThat(joinedNames).isEqualTo("|source a|target 1|source a2|target 1b"); assertThat(joinedNames).isEqualTo("|source a|target 1|source a2|target 1b");
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t1.dtype, t1.id, t1.name from source_base t0 left join target_base t1 on t1.id = t0.target_id and t1.dtype = 'Target1' where t0.dtype = 'SourceA' order by t0.pos"); assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t1.dtype, t1.id, t1.name from source_base t0 left join target_base t1 on t1.id = t0.target_id and t1.dtype = 'Target1' where t0.dtype = 'SourceA' order by t0.pos");
} }
@@ -97,7 +97,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
*/ */
private void assertFetchAllDoubleLazyLoading() { private void assertFetchAllDoubleLazyLoading() {
LoggedSqlCollector.start(); LoggedSql.start();
final List<SourceBase> sources = DB.find(SourceBase.class).order("pos").findList(); final List<SourceBase> sources = DB.find(SourceBase.class).order("pos").findList();
for (SourceBase source : sources) { for (SourceBase source : sources) {
@@ -113,7 +113,7 @@ public class TestInheritanceBothSides extends BaseTestCase {
} }
} }
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
//assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t0.target_id, t0.target_id from source_base t0 order by t0.pos"); //assertSql(sql.get(0)).contains("select t0.dtype, t0.id, t0.name, t0.pos, t0.target_id, t0.target_id from source_base t0 order by t0.pos");
ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java
Vendored
+11 -11
View File
@@ -2,7 +2,7 @@ package org.tests.inheritance.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhOne;
import org.tests.model.basic.cache.CInhRef; import org.tests.model.basic.cache.CInhRef;
@@ -33,32 +33,32 @@ public class TestInheritanceRefCache extends BaseTestCase {
Integer id = ref.getId(); Integer id = ref.getId();
LoggedSqlCollector.start(); LoggedSql.start();
CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne(); CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root"); assertSql(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root");
// fetch again - from cache (but fetch second bean from cache) // fetch again - from cache (but fetch second bean from cache)
LoggedSqlCollector.start(); LoggedSql.start();
gotRef = DB.find(CInhRef.class).setId(id).findOne(); gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
// fetch again - both from cache // fetch again - both from cache
LoggedSqlCollector.start(); LoggedSql.start();
gotRef = DB.find(CInhRef.class).setId(id).findOne(); gotRef = DB.find(CInhRef.class).setId(id).findOne();
assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef).isInstanceOf(CInhRef.class);
assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
} }
@@ -84,11 +84,11 @@ public class TestInheritanceRefCache extends BaseTestCase {
ids.add(two.getId()); ids.add(two.getId());
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("from cinh_root"); assertSql(sql.get(0)).contains("from cinh_root");
@@ -97,11 +97,11 @@ public class TestInheritanceRefCache extends BaseTestCase {
DB.find(CInhRoot.class).setUseQueryCache(true).findList(); DB.find(CInhRoot.class).setUseQueryCache(true).findList();
DB.find(CInhRoot.class).setUseQueryCache(true).findList(); DB.find(CInhRoot.class).setUseQueryCache(true).findList();
LoggedSqlCollector.start(); LoggedSql.start();
DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
} }
ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java
+3 -3
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Database; import io.ebean.Database;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -20,11 +20,11 @@ public class TestOnlyIdEntity extends BaseTestCase {
final Database database = DB.getDefault(); final Database database = DB.getDefault();
LoggedSqlCollector.start(); LoggedSql.start();
OnlyIdEntity bean = new OnlyIdEntity(); OnlyIdEntity bean = new OnlyIdEntity();
database.save(bean); database.save(bean);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(bean.getId()).isGreaterThan(0); assertThat(bean.getId()).isGreaterThan(0);
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.PagedList; import io.ebean.PagedList;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.carwheel.Car; import org.tests.model.carwheel.Car;
import org.tests.model.carwheel.Tire; import org.tests.model.carwheel.Tire;
@@ -71,7 +71,7 @@ public class TestCarWheelIud extends BaseTestCase {
DB.saveAll(asList(car0, car1, car2)); DB.saveAll(asList(car0, car1, car2));
LoggedSqlCollector.start(); LoggedSql.start();
final PagedList<Car> pagedList = DB.find(Car.class) final PagedList<Car> pagedList = DB.find(Car.class)
.select("brand, totalSold") .select("brand, totalSold")
@@ -84,7 +84,7 @@ public class TestCarWheelIud extends BaseTestCase {
assertThat(list).hasSize(2); assertThat(list).hasSize(2);
assertThat(count).isEqualTo(2); assertThat(count).isEqualTo(2);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
if (isH2() || isPostgres()) { if (isH2() || isPostgres()) {
assertSql(sql.get(0)).contains("select t0.brand, sum(t0.sold) from sa_car t0 group by t0.brand limit 10"); assertSql(sql.get(0)).contains("select t0.brand, sum(t0.sold) from sa_car t0 group by t0.brand limit 10");
ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.iud;
import io.avaje.moduuid.ModUUID; import io.avaje.moduuid.ModUUID;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -21,10 +21,10 @@ public class TestPersistCascade extends BaseTestCase {
country.addCity(new PcfCity("city_" + ModUUID.newShortId(), mayor, viceMayor)); country.addCity(new PcfCity("city_" + ModUUID.newShortId(), mayor, viceMayor));
} }
LoggedSqlCollector.start(); LoggedSql.start();
country.save(); country.save();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertSql(sql.get(0)).contains("insert into pcf_country"); assertSql(sql.get(0)).contains("insert into pcf_country");
ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java
+1 -1
View File
@@ -8,7 +8,7 @@ import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistAdapter;
import io.ebean.event.BeanPersistRequest; import io.ebean.event.BeanPersistRequest;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.json.EBasicJsonJackson3; import org.tests.model.json.EBasicJsonJackson3;
import org.tests.model.json.EBasicJsonList; import org.tests.model.json.EBasicJsonList;
ebean-test/src/test/java/org/tests/json/TestDbJson_List.java
+9 -9
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebean.text.TextException; import io.ebean.text.TextException;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.json.EBasicJsonList; import org.tests.model.json.EBasicJsonList;
import org.tests.model.json.PlainBean; import org.tests.model.json.PlainBean;
@@ -102,9 +102,9 @@ public class TestDbJson_List extends BaseTestCase {
private void update_when_notDirty() { private void update_when_notDirty() {
found.setName("mod"); found.setName("mod");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
// plain_bean=?, no longer included with dirty detection // plain_bean=?, no longer included with dirty detection
@@ -118,9 +118,9 @@ public class TestDbJson_List extends BaseTestCase {
//found.setName("modAgain"); //found.setName("modAgain");
found.getTags().add("three"); found.getTags().add("three");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
// plain_bean=? not included using MD5 dirty detection // plain_bean=? not included using MD5 dirty detection
@@ -132,9 +132,9 @@ public class TestDbJson_List extends BaseTestCase {
//found.setName("modAgain"); //found.setName("modAgain");
found.getFlags().remove(42L); found.getFlags().remove(42L);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
// plain_bean=? not included with MD5 dirty detection // plain_bean=? not included with MD5 dirty detection
@@ -148,9 +148,9 @@ public class TestDbJson_List extends BaseTestCase {
found.getBeanList().clear(); found.getBeanList().clear();
found.getBeanMap().remove("key0"); found.getBeanMap().remove("key0");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
// plain_bean=? not included with MD5 dirty detection // plain_bean=? not included with MD5 dirty detection
ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import io.ebean.text.json.EJson; import io.ebean.text.json.EJson;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.tests.model.json.EBasicJsonMap; import org.tests.model.json.EBasicJsonMap;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.json.EBasicJsonMapDetail; import org.tests.model.json.EBasicJsonMapDetail;
ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+3 -3
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import io.ebean.text.PathProperties; import io.ebean.text.PathProperties;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ public class TestLazyForeignKeys extends BaseTestCase {
@Test @Test
public void testFindOne() throws Exception { public void testFindOne() throws Exception {
// use findOne without select, so lazy loading will occur // use findOne without select, so lazy loading will occur
LoggedSqlCollector.start(); LoggedSql.start();
MainEntityRelation rel1 = DB.find(MainEntityRelation.class).findOne(); MainEntityRelation rel1 = DB.find(MainEntityRelation.class).findOne();
@@ -55,7 +55,7 @@ public class TestLazyForeignKeys extends BaseTestCase {
assertFalse(rel1.getEntity1().isDeleted()); assertFalse(rel1.getEntity1().isDeleted());
assertTrue(rel1.getEntity2().isDeleted()); assertTrue(rel1.getEntity2().isDeleted());
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation"); assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation");
if (isSqlServer() || isOracle()) { if (isSqlServer() || isOracle()) {
ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java
+7 -7
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.MnocRole; import org.tests.model.basic.MnocRole;
@@ -43,10 +43,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase {
List<MnocRole> validRoles = loadedUser.getValidRoles(); List<MnocRole> validRoles = loadedUser.getValidRoles();
assertThat(validRoles).hasSize(2); assertThat(validRoles).hasSize(2);
LoggedSqlCollector.start(); LoggedSql.start();
DB.delete(u0); DB.delete(u0);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?");
assertSql(sql.get(1)).contains("delete from mnoc_user where user_id=? and version=?"); assertSql(sql.get(1)).contains("delete from mnoc_user where user_id=? and version=?");
@@ -71,10 +71,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase {
user.setUserName("usr1-mod"); user.setUserName("usr1-mod");
user.setValidRoles(roles); user.setValidRoles(roles);
LoggedSqlCollector.start(); LoggedSql.start();
DB.update(user); DB.update(user);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(5); assertThat(sql).hasSize(5);
assertSql(sql.get(0)).contains("update mnoc_user set user_name=?, version=? where user_id=? and version=?"); assertSql(sql.get(0)).contains("update mnoc_user set user_name=?, version=? where user_id=? and version=?");
assertSql(sql.get(1)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertSql(sql.get(1)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?");
@@ -97,7 +97,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase {
DB.save(u0); DB.save(u0);
DB.save(u1); DB.save(u1);
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = DB.beginTransaction()) { try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true); txn.setBatchMode(true);
@@ -106,7 +106,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase {
txn.commit(); txn.commit();
} }
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(8); assertThat(sql).hasSize(8);
assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?");
assertThat(sql.get(4)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertThat(sql.get(4)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?");
ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.m2m.Permission; import org.tests.model.m2m.Permission;
import org.tests.model.m2m.Role; import org.tests.model.m2m.Role;
ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java
+5 -5
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.MergeOptions; import io.ebean.MergeOptions;
import io.ebean.MergeOptionsBuilder; import io.ebean.MergeOptionsBuilder;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.UUOne; import org.tests.model.basic.UUOne;
import org.tests.model.basic.UUTwo; import org.tests.model.basic.UUTwo;
@@ -44,11 +44,11 @@ public class TestMergeBasic extends BaseTestCase {
.setClientGeneratedIds() .setClientGeneratedIds()
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
DB.merge(one, options); DB.merge(one, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// fetch the Ids ... used to identity inserts, updates and deletes // fetch the Ids ... used to identity inserts, updates and deletes
assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
@@ -92,11 +92,11 @@ public class TestMergeBasic extends BaseTestCase {
.addPath("comments") .addPath("comments")
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
DB.merge(one, options); DB.merge(one, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// fetch the Ids ... used to identity inserts, updates and deletes // fetch the Ids ... used to identity inserts, updates and deletes
assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t1.id from uuone t0 left join uutwo t1 on t1.master_id = t0.id where t0.id = ?");
ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java
+21 -21
View File
@@ -6,7 +6,7 @@ import io.ebean.FetchPath;
import io.ebean.MergeOptions; import io.ebean.MergeOptions;
import io.ebean.MergeOptionsBuilder; import io.ebean.MergeOptionsBuilder;
import io.ebean.text.PathProperties; import io.ebean.text.PathProperties;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;
@@ -26,11 +26,11 @@ public class TestMergeCustomer extends BaseTestCase {
MCustomer mCustomer = partial("cust1", "(id,name,version)"); MCustomer mCustomer = partial("cust1", "(id,name,version)");
mCustomer.setName("NotCust0"); mCustomer.setName("NotCust0");
LoggedSqlCollector.start(); LoggedSql.start();
DB.merge(mCustomer); DB.merge(mCustomer);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?");
} }
@@ -48,11 +48,11 @@ public class TestMergeCustomer extends BaseTestCase {
MergeOptions options = new MergeOptionsBuilder().build(); MergeOptions options = new MergeOptionsBuilder().build();
LoggedSqlCollector.start(); LoggedSql.start();
DB.merge(mCustomer, options); DB.merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update mcustomer set name=?, version=? where id=? and version=?");
} }
@@ -66,11 +66,11 @@ public class TestMergeCustomer extends BaseTestCase {
MergeOptions options = new MergeOptionsBuilder().setClientGeneratedIds().build(); MergeOptions options = new MergeOptionsBuilder().setClientGeneratedIds().build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id from mcustomer t0 where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id from mcustomer t0 where t0.id = ?");
assertSql(sql.get(1)).contains("update mcustomer set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("update mcustomer set name=?, version=? where id=? and version=?");
@@ -90,11 +90,11 @@ public class TestMergeCustomer extends BaseTestCase {
.setClientGeneratedIds() .setClientGeneratedIds()
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(5); assertThat(sql).hasSize(5);
assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?");
assertSql(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?");
@@ -119,11 +119,11 @@ public class TestMergeCustomer extends BaseTestCase {
.setClientGeneratedIds() .setClientGeneratedIds()
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(6); assertThat(sql).hasSize(6);
assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?");
assertSql(sql.get(1)).contains("insert into maddress (id, street, city, version) values (?,?,?,?)"); assertSql(sql.get(1)).contains("insert into maddress (id, street, city, version) values (?,?,?,?)");
@@ -152,11 +152,11 @@ public class TestMergeCustomer extends BaseTestCase {
.setClientGeneratedIds() // As we are using clientIds ... we don't know if the new UUID is an insert or update without checking .setClientGeneratedIds() // As we are using clientIds ... we don't know if the new UUID is an insert or update without checking
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?");
@@ -210,10 +210,10 @@ public class TestMergeCustomer extends BaseTestCase {
.addPath("contacts") .addPath("contacts")
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(20); assertThat(sql).hasSize(20);
} }
@@ -236,10 +236,10 @@ public class TestMergeCustomer extends BaseTestCase {
.addPath("contacts") .addPath("contacts")
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(20); assertThat(sql).hasSize(20);
} }
@@ -274,10 +274,10 @@ public class TestMergeCustomer extends BaseTestCase {
.addPath("contacts") .addPath("contacts")
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(mCustomer, options); server().merge(mCustomer, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(16); assertThat(sql).hasSize(16);
assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?");
@@ -314,10 +314,10 @@ public class TestMergeCustomer extends BaseTestCase {
.setDeletePermanent() .setDeletePermanent()
.build(); .build();
LoggedSqlCollector.start(); LoggedSql.start();
server().merge(cust1, options); server().merge(cust1, options);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertSql(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id left join mcontact t2 on t2.customer_id = t0.id where t0.id = ?"); assertSql(sql.get(0)).contains("select t0.id, t3.id, t1.id, t2.id from mcustomer t0 left join maddress t3 on t3.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id left join mcontact t2 on t2.customer_id = t0.id where t0.id = ?");
ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java
+4 -4
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.MergeOptions; import io.ebean.MergeOptions;
import io.ebean.MergeOptionsBuilder; import io.ebean.MergeOptionsBuilder;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -35,11 +35,11 @@ public class TestMergeM2M extends BaseTestCase {
MergeOptions options = new MergeOptionsBuilder().addPath("groups").build(); MergeOptions options = new MergeOptionsBuilder().addPath("groups").build();
LoggedSqlCollector.start(); LoggedSql.start();
DB.merge(m0, options); DB.merge(m0, options);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(6); assertThat(sql).hasSize(6);
assertSql(sql.get(0)).contains("select"); assertSql(sql.get(0)).contains("select");
@@ -65,7 +65,7 @@ public class TestMergeM2M extends BaseTestCase {
DB.merge(m1, options); DB.merge(m1, options);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(9); assertThat(sql).hasSize(9);
assertSql(sql.get(0)).contains("select"); assertSql(sql.get(0)).contains("select");
assertSql(sql.get(1)).contains("delete from mmachine_mgroup"); assertSql(sql.get(1)).contains("delete from mmachine_mgroup");
ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java
+7 -7
View File
@@ -2,7 +2,7 @@ package org.tests.model.aggregation;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -16,7 +16,7 @@ public class TestAggregationMany extends BaseTestCase {
DOrg org = MachineUseData.load(); DOrg org = MachineUseData.load();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachine> machines = DB.find(DMachine.class) List<DMachine> machines = DB.find(DMachine.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -29,7 +29,7 @@ public class TestAggregationMany extends BaseTestCase {
assertThat(machine.getMachineStats()).isEmpty(); assertThat(machine.getMachineStats()).isEmpty();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.organisation_id from dmachine t0 where t0.organisation_id = ?"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t0.organisation_id from dmachine t0 where t0.organisation_id = ?");
@@ -46,7 +46,7 @@ public class TestAggregationMany extends BaseTestCase {
DOrg org = MachineUseData.load(); DOrg org = MachineUseData.load();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachine> machines = DB.find(DMachine.class) List<DMachine> machines = DB.find(DMachine.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -60,7 +60,7 @@ public class TestAggregationMany extends BaseTestCase {
assertThat(machine.getMachineStats()).isEmpty(); assertThat(machine.getMachineStats()).isEmpty();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t1.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name, t1.name order by t0.id"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t1.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name, t1.name order by t0.id");
@@ -71,7 +71,7 @@ public class TestAggregationMany extends BaseTestCase {
DOrg org = MachineUseData.load(); DOrg org = MachineUseData.load();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachine> machines = DB.find(DMachine.class) List<DMachine> machines = DB.find(DMachine.class)
.setDisableLazyLoading(true) .setDisableLazyLoading(true)
@@ -86,7 +86,7 @@ public class TestAggregationMany extends BaseTestCase {
assertThat(machine.getMachineStats()).isEmpty(); assertThat(machine.getMachineStats()).isEmpty();
} }
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name order by t0.id"); assertSql(sql.get(0)).contains("select t0.id, t0.name, sum(t1.use_secs), sum(t1.fuel) from dmachine t0 left join d_machine_aux_use t1 on t1.machine_id = t0.id where t0.organisation_id = ? group by t0.id, t0.name order by t0.id");
ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java
+15 -15
View File
@@ -3,7 +3,7 @@ package org.tests.model.aggregation;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -42,11 +42,11 @@ public class TestAggregationTopLevel extends BaseTestCase {
.having().gt("totalKms", 1) .having().gt("totalKms", 1)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
query.findCount(); query.findCount();
query.findList(); query.findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
if (isH2() || isPostgres()) { if (isH2() || isPostgres()) {
@@ -136,12 +136,12 @@ public class TestAggregationTopLevel extends BaseTestCase {
.having().gt("sum(hours)", 2) .having().gt("sum(hours)", 2)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachineStats> result = query.findList(); List<DMachineStats> result = query.findList();
assertThat(result).isNotEmpty(); assertThat(result).isNotEmpty();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t1.id, t1.name having sum(t0.hours) > ?"); assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t1.id, t1.name having sum(t0.hours) > ?");
} }
@@ -156,12 +156,12 @@ public class TestAggregationTopLevel extends BaseTestCase {
.having().gt("sum(hours)", 2) .having().gt("sum(hours)", 2)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachineStats> result = query.findList(); List<DMachineStats> result = query.findList();
assertThat(result).isNotEmpty(); assertThat(result).isNotEmpty();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t0.edate, t1.id, t1.name having sum(t0.hours) > ?"); } assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t1.id, t1.name from d_machine_stats t0 join dmachine t1 on t1.id = t0.machine_id where t0.edate > ? group by t0.edate, t1.id, t1.name having sum(t0.hours) > ?"); }
@@ -176,12 +176,12 @@ public class TestAggregationTopLevel extends BaseTestCase {
.having().gt("sum(hours)", 2) .having().gt("sum(hours)", 2)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachineStats> result = query.findList(); List<DMachineStats> result = query.findList();
assertThat(result).isNotEmpty(); assertThat(result).isNotEmpty();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.machine_id having sum(t0.hours) > ?"); assertSql(sql.get(0)).contains("select sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.machine_id having sum(t0.hours) > ?");
@@ -198,12 +198,12 @@ public class TestAggregationTopLevel extends BaseTestCase {
.having().gt("sum(hours)", 2) .having().gt("sum(hours)", 2)
.query(); .query();
LoggedSqlCollector.start(); LoggedSql.start();
List<DMachineStats> result = query.findList(); List<DMachineStats> result = query.findList();
assertThat(result).isNotEmpty(); assertThat(result).isNotEmpty();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.edate, t0.machine_id having sum(t0.hours) > ?"); assertSql(sql.get(0)).contains("select t0.edate, sum(t0.total_kms), sum(t0.hours), t0.machine_id from d_machine_stats t0 where t0.edate > ? group by t0.edate, t0.machine_id having sum(t0.hours) > ?");
@@ -226,7 +226,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
@Test @Test
public void groupBy_in_fetchClause_singleRowInMany() { public void groupBy_in_fetchClause_singleRowInMany() {
LoggedSqlCollector.start(); LoggedSql.start();
Query<DMachine> query = DB.find(DMachine.class) Query<DMachine> query = DB.find(DMachine.class)
.select("name") .select("name")
@@ -238,7 +238,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
assertThat(result).isNotEmpty(); assertThat(result).isNotEmpty();
assertThat(result.get(0).getMachineStats().get(0).getTotalKms()).isNotNull(); assertThat(result.get(0).getMachineStats().get(0).getTotalKms()).isNotNull();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(sqlOf(query)).contains("select t0.id, t0.name, sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name order by t0.id"); assertThat(sqlOf(query)).contains("select t0.id, t0.name, sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name order by t0.id");
@@ -247,7 +247,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
@Test @Test
public void groupBy_in_fetchClause_multipleRowsInMany() { public void groupBy_in_fetchClause_multipleRowsInMany() {
LoggedSqlCollector.start(); LoggedSql.start();
Query<DMachine> query = DB.find(DMachine.class) Query<DMachine> query = DB.find(DMachine.class)
.select("name") .select("name")
@@ -264,7 +264,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
assertThat(firstStat.getRate()).isNotNull(); assertThat(firstStat.getRate()).isNotNull();
assertThat(firstStat.getDate()).isNotNull(); assertThat(firstStat.getDate()).isNotNull();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertThat(sqlOf(query)).contains("select t0.id, t0.name, t1.edate, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name, t1.edate order by t0.id"); assertThat(sqlOf(query)).contains("select t0.id, t0.name, t1.edate, max(t1.rate), sum(t1.total_kms) from dmachine t0 left join d_machine_stats t1 on t1.machine_id = t0.id where t0.name = ? group by t0.id, t0.name, t1.edate order by t0.id");
ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java
+5 -5
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Query; import io.ebean.Query;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.HashSet; import java.util.HashSet;
@@ -108,9 +108,9 @@ public class TestDbArray_asSet extends BaseTestCase {
public void update_when_notDirty() { public void update_when_notDirty() {
found.setName("jack"); found.setName("jack");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
assertSql(sql.get(0)).contains("update earray_set_bean set name=?, version=? where"); assertSql(sql.get(0)).contains("update earray_set_bean set name=?, version=? where");
@@ -122,9 +122,9 @@ public class TestDbArray_asSet extends BaseTestCase {
found.getPhoneNumbers().add("9987"); found.getPhoneNumbers().add("9987");
found.getUids().add(UUID.randomUUID()); found.getUids().add(UUID.randomUUID());
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where"); assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where");
} }
ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
+5 -5
View File
@@ -7,7 +7,7 @@ import io.ebean.SqlRow;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.sql.SQLException; import java.sql.SQLException;
@@ -142,9 +142,9 @@ public class TestDbArray_basic extends BaseTestCase {
public void update_when_notDirty() { public void update_when_notDirty() {
found.setName("jack"); found.setName("jack");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// we don't update the phone numbers (as they are not dirty) // we don't update the phone numbers (as they are not dirty)
assertSql(sql.get(0)).contains("update earray_bean set name=?, version=? where"); assertSql(sql.get(0)).contains("update earray_bean set name=?, version=? where");
@@ -156,9 +156,9 @@ public class TestDbArray_basic extends BaseTestCase {
found.getPhoneNumbers().add("9987"); found.getPhoneNumbers().add("9987");
found.getUids().add(UUID.randomUUID()); found.getUids().add(UUID.randomUUID());
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(found); DB.save(found);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertSql(sql.get(0)).contains("update earray_bean set phone_numbers=?, uids=?, version=? where"); assertSql(sql.get(0)).contains("update earray_bean set phone_numbers=?, uids=?, version=? where");
} }
ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
Vendored
+9 -9
View File
@@ -6,7 +6,7 @@ import io.ebean.DB;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheManager;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -95,7 +95,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
String storeId = "abc"; String storeId = "abc";
List<String> skus = Arrays.asList("1", "2", "3"); List<String> skus = Arrays.asList("1", "2", "3");
LoggedSqlCollector.start(); LoggedSql.start();
log.info("Partial (2 of 3) ..."); log.info("Partial (2 of 3) ...");
List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class) List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class)
@@ -106,7 +106,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2) // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
@@ -125,7 +125,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
@@ -144,7 +144,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(list).hasSize(3); assertThat(list).hasSize(3);
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
@@ -164,7 +164,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
String storeId = "abc"; String storeId = "abc";
List<String> skus = new ArrayList<>(Arrays.asList("1", "2")); List<String> skus = new ArrayList<>(Arrays.asList("1", "2"));
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class) List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class)
.where() .where()
@@ -174,7 +174,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// no SQL - all beans from cache // no SQL - all beans from cache
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
@@ -193,7 +193,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
String storeId = "abc"; String storeId = "abc";
List<String> skus = new ArrayList<>(Arrays.asList("3", "4")); List<String> skus = new ArrayList<>(Arrays.asList("3", "4"));
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class) List<OCachedNatKeyBean> list = DB.find(OCachedNatKeyBean.class)
.where() .where()
@@ -203,7 +203,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with 2 bind params as we got not hits on the cache // in clause with 2 bind params as we got not hits on the cache
ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
Vendored
+17 -17
View File
@@ -7,7 +7,7 @@ import io.ebean.Pairs;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheManager;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -100,7 +100,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
List<Integer> codes = asList(1001); List<Integer> codes = asList(1001);
LoggedSqlCollector.start(); LoggedSql.start();
Map<String,OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) Map<String,OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -112,7 +112,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.setMapKey("sku") .setMapKey("sku")
.findMap(); .findMap();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
assertThat(list).hasSize(1); assertThat(list).hasSize(1);
@@ -129,7 +129,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
List<Integer> codes = asList(1001, 1000); List<Integer> codes = asList(1001, 1000);
LoggedSqlCollector.start(); LoggedSql.start();
Map<String,OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) Map<String,OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -141,7 +141,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.setMapKey("sku") .setMapKey("sku")
.findMap(); .findMap();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with only 1 bind param - miss on 1000 // in clause with only 1 bind param - miss on 1000
@@ -158,7 +158,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
setup(); setup();
LoggedSqlCollector.start(); LoggedSql.start();
Map<String,OCachedNatKeyBean3> map = DB.find(OCachedNatKeyBean3.class) Map<String,OCachedNatKeyBean3> map = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -169,7 +169,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.setMapKey("code") .setMapKey("code")
.findMap(); .findMap();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with only 1 bind param - miss on 1000, 1002 // in clause with only 1 bind param - miss on 1000, 1002
@@ -190,7 +190,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
List<Integer> codes = asList(1001, 1000, 1002, 1003); List<Integer> codes = asList(1001, 1000, 1002, 1003);
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -202,7 +202,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.order().asc("code") .order().asc("code")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2) // in clause with only 1 bind param - (sku=3 ... we got hits on sku 1 and 2)
@@ -223,7 +223,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
List<String> skus = asList("2", "3"); List<String> skus = asList("2", "3");
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -234,7 +234,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
// no SQL - all beans from cache // no SQL - all beans from cache
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
@@ -253,7 +253,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
String storeId = "abc"; String storeId = "abc";
List<String> skus = asList("3", "2", "4"); List<String> skus = asList("3", "2", "4");
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -264,7 +264,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2()) { if (isH2()) {
// in clause with 2 bind params as we got not hits on the cache // in clause with 2 bind params as we got not hits on the cache
@@ -349,7 +349,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.add("2", 1001) .add("2", 1001)
.add("3", 1000); .add("3", 1000);
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -359,7 +359,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(pairs.getEntries()).hasSize(3); assertThat(pairs.getEntries()).hasSize(3);
@@ -392,7 +392,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.add("2", 1001) .add("2", 1001)
.add("3", 1000); .add("3", 1000);
LoggedSqlCollector.start(); LoggedSql.start();
List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class) List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
.where() .where()
@@ -402,7 +402,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
.order("sku desc") .order("sku desc")
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(pairs.getEntries()).hasSize(3); assertThat(pairs.getEntries()).hasSize(3);
ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java
Vendored
+7 -7
View File
@@ -3,7 +3,7 @@ package org.tests.model.basic.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -37,12 +37,12 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase {
resetAllMetrics(); resetAllMetrics();
LoggedSqlCollector.start(); LoggedSql.start();
final OCachedAppDetail found1 = findDetail(app0, "detail0"); final OCachedAppDetail found1 = findDetail(app0, "detail0");
assertThat(found1).isNotNull(); assertThat(found1).isNotNull();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty();
assertThat(getStats().getHitCount()).isEqualTo(1); assertThat(getStats().getHitCount()).isEqualTo(1);
} }
@@ -67,11 +67,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase {
assertThat(result0).hasSize(2); assertThat(result0).hasSize(2);
assertThat(getStats().getHitCount()).isEqualTo(0); assertThat(getStats().getHitCount()).isEqualTo(0);
LoggedSqlCollector.start(); LoggedSql.start();
final List<OCachedAppDetail> result1 = findListDetails(app0, "detail0", "detail1"); final List<OCachedAppDetail> result1 = findListDetails(app0, "detail0", "detail1");
assertThat(result1).hasSize(2); assertThat(result1).hasSize(2);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty();
assertThat(getStats().getHitCount()).isEqualTo(2); assertThat(getStats().getHitCount()).isEqualTo(2);
} }
@@ -96,11 +96,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase {
assertThat(result0).hasSize(2); assertThat(result0).hasSize(2);
assertThat(getStats().getHitCount()).isEqualTo(0); assertThat(getStats().getHitCount()).isEqualTo(0);
LoggedSqlCollector.start(); LoggedSql.start();
final List<OCachedAppDetail> result1 = findListApps("detail0", app0, app1); final List<OCachedAppDetail> result1 = findListApps("detail0", app0, app1);
assertThat(result1).hasSize(2); assertThat(result1).hasSize(2);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty();
assertThat(getStats().getHitCount()).isEqualTo(2); assertThat(getStats().getHitCount()).isEqualTo(2);
} }
ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ package org.tests.model.basic.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -55,12 +55,12 @@ public class TestNatKeyUid extends BaseTestCase {
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(appStats().getHitCount()).isEqualTo(0); assertThat(appStats().getHitCount()).isEqualTo(0);
LoggedSqlCollector.start(); LoggedSql.start();
result = findMany(); result = findMany();
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(appStats().getHitCount()).isEqualTo(2); assertThat(appStats().getHitCount()).isEqualTo(2);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).as("Expected hit cache, no sql").isEmpty(); assertThat(sql).as("Expected hit cache, no sql").isEmpty();
} }
ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+6 -6
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;
@@ -21,7 +21,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
@IgnorePlatform(Platform.HANA) @IgnorePlatform(Platform.HANA)
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = DB.beginTransaction()) { try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true); txn.setBatchMode(true);
@@ -38,23 +38,23 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase {
DB.save(parent); DB.save(parent);
// nothing flushed yet // nothing flushed yet
assertThat(LoggedSqlCollector.start()).isEmpty(); assertThat(LoggedSql.start()).isEmpty();
txn.flush(); txn.flush();
List<String> loggedSql1 = LoggedSqlCollector.start(); List<String> loggedSql1 = LoggedSql.start();
assertThat(loggedSql1).hasSize(4); assertThat(loggedSql1).hasSize(4);
parent.setName("MyDesk"); parent.setName("MyDesk");
DB.save(parent); DB.save(parent);
// nothing flushed yet // nothing flushed yet
assertThat(LoggedSqlCollector.start()).isEmpty(); assertThat(LoggedSql.start()).isEmpty();
DB.commitTransaction(); DB.commitTransaction();
// insert statements for EdExtendedParent // insert statements for EdExtendedParent
List<String> loggedSql2 = LoggedSqlCollector.start(); List<String> loggedSql2 = LoggedSql.start();
assertThat(loggedSql2).hasSize(2); assertThat(loggedSql2).hasSize(2);
assertThat(loggedSql2.get(0)).contains(" update td_parent "); assertThat(loggedSql2.get(0)).contains(" update td_parent ");
} }
ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+7 -7
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;
@@ -19,11 +19,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
@IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = DB.beginTransaction()) { try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true); txn.setBatchMode(true);
LoggedSqlCollector.start(); LoggedSql.start();
EdParent parent = new EdParent(); EdParent parent = new EdParent();
parent.setName("MyComputer"); parent.setName("MyComputer");
@@ -47,7 +47,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
DB.commitTransaction(); DB.commitTransaction();
// insert statements for EdExtendedParent // insert statements for EdExtendedParent
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(6); assertThat(loggedSql).hasSize(6);
assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(0)).contains("insert into td_parent");
assertThat(loggedSql.get(2)).contains("insert into td_child "); assertThat(loggedSql.get(2)).contains("insert into td_child ");
@@ -60,11 +60,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
@IgnorePlatform(Platform.HANA) @IgnorePlatform(Platform.HANA)
public void test_noFlushOn_getterOfNonGeneratedProperty() { public void test_noFlushOn_getterOfNonGeneratedProperty() {
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = DB.beginTransaction()) { try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true); txn.setBatchMode(true);
LoggedSqlCollector.start(); LoggedSql.start();
EdParent parent = new EdParent(); EdParent parent = new EdParent();
parent.setName("MyComputer"); parent.setName("MyComputer");
@@ -90,7 +90,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase {
DB.commitTransaction(); DB.commitTransaction();
// insert statements for EdExtendedParent // insert statements for EdExtendedParent
List<String> loggedSql = LoggedSqlCollector.stop(); List<String> loggedSql = LoggedSql.stop();
assertThat(loggedSql).hasSize(4); assertThat(loggedSql).hasSize(4);
assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(0)).contains("insert into td_parent");
assertThat(loggedSql.get(2)).contains("insert into td_child "); assertThat(loggedSql.get(2)).contains("insert into td_child ");
ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+5 -5
View File
@@ -5,7 +5,7 @@ import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;
@@ -19,7 +19,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
@IgnorePlatform(Platform.HANA) @IgnorePlatform(Platform.HANA)
public void testDifferRootTypes() { public void testDifferRootTypes() {
LoggedSqlCollector.start(); LoggedSql.start();
try (Transaction txn = DB.beginTransaction()) { try (Transaction txn = DB.beginTransaction()) {
txn.setBatchMode(true); txn.setBatchMode(true);
@@ -47,7 +47,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
extendedParent.setChildren(children); extendedParent.setChildren(children);
// nothing flushed yet // nothing flushed yet
List<String> loggedSql0 = LoggedSqlCollector.start(); List<String> loggedSql0 = LoggedSql.start();
assertEquals(0, loggedSql0.size()); assertEquals(0, loggedSql0.size());
// does not causes a flush as EdExtendedParent is same root as EdParent // does not causes a flush as EdExtendedParent is same root as EdParent
@@ -55,14 +55,14 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase {
DB.save(extendedParent); DB.save(extendedParent);
// insert statements for EdParent // insert statements for EdParent
List<String> loggedSql1 = LoggedSqlCollector.start(); List<String> loggedSql1 = LoggedSql.start();
DB.commitTransaction(); DB.commitTransaction();
assertEquals(0, loggedSql1.size()); assertEquals(0, loggedSql1.size());
// insert statements for EdExtendedParent // insert statements for EdExtendedParent
List<String> loggedSql2 = LoggedSqlCollector.start(); List<String> loggedSql2 = LoggedSql.start();
assertEquals(7, loggedSql2.size()); assertEquals(7, loggedSql2.size());
} }
ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java
+7 -7
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -96,7 +96,7 @@ public class TestIdClassScalar extends BaseTestCase {
*/ */
private void insertUpdateBridgeD(BUser user, BSite site) { private void insertUpdateBridgeD(BUser user, BSite site) {
LoggedSqlCollector.start(); LoggedSql.start();
BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id); BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id);
DB.save(access); DB.save(access);
@@ -112,7 +112,7 @@ public class TestIdClassScalar extends BaseTestCase {
assertThat(bridge.getUserId()).isEqualTo(user.id); assertThat(bridge.getUserId()).isEqualTo(user.id);
} }
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("insert into bsite_user_d (site_id, user_id, access_level, version) values (?,?,?,?)"); assertSql(sql.get(0)).contains("insert into bsite_user_d (site_id, user_id, access_level, version) values (?,?,?,?)");
assertSql(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?"); assertSql(sql.get(1)).contains("update bsite_user_d set access_level=?, version=? where site_id=? and user_id=? and version=?");
@@ -129,7 +129,7 @@ public class TestIdClassScalar extends BaseTestCase {
one.setAccessLevel(BAccessLevel.THREE); one.setAccessLevel(BAccessLevel.THREE);
DB.save(one); DB.save(one);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id=? and t0.user_id=?"); assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.site_id, t0.user_id, t0.access_level, t0.version from bsite_user_d t0 where t0.site_id=? and t0.user_id=?");
@@ -141,7 +141,7 @@ public class TestIdClassScalar extends BaseTestCase {
*/ */
private void insertUpdateBridgeE(BUser user, BSite site) { private void insertUpdateBridgeE(BUser user, BSite site) {
LoggedSqlCollector.start(); LoggedSql.start();
BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user); BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user);
DB.save(access); DB.save(access);
@@ -152,7 +152,7 @@ public class TestIdClassScalar extends BaseTestCase {
List<BSiteUserE> list = DB.find(BSiteUserE.class).findList(); List<BSiteUserE> list = DB.find(BSiteUserE.class).findList();
assertThat(list).isNotEmpty(); assertThat(list).isNotEmpty();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(3); assertThat(sql).hasSize(3);
assertSql(sql.get(0)).contains("insert into bsite_user_e (site_id, user_id, access_level)"); assertSql(sql.get(0)).contains("insert into bsite_user_e (site_id, user_id, access_level)");
assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?"); assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
@@ -175,7 +175,7 @@ public class TestIdClassScalar extends BaseTestCase {
one.setAccessLevel(BAccessLevel.THREE); one.setAccessLevel(BAccessLevel.THREE);
DB.save(one); DB.save(one);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id=? and t0.user_id=?"); assertSql(sql.get(0)).contains("select t0.site_id, t0.user_id, t0.access_level, t0.site_id, t0.user_id from bsite_user_e t0 where t0.site_id=? and t0.user_id=?");
ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebeantest.LoggedSql; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -16,7 +16,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase {
final TTruckHolder holder = setup(); final TTruckHolder holder = setup();
LoggedSqlCollector.start(); LoggedSql.start();
final TTruckHolder found = DB.find(TTruckHolder.class) final TTruckHolder found = DB.find(TTruckHolder.class)
.fetch("items") .fetch("items")
@@ -27,7 +27,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase {
assertThat(found.getItems()).hasSize(2); assertThat(found.getItems()).hasSize(2);
assertThat(found.getItems()).extracting(TTruckHolderItem::getFoo).contains("a","b"); assertThat(found.getItems()).extracting(TTruckHolderItem::getFoo).contains("a","b");
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
if (isH2() || isPostgres()) { if (isH2() || isPostgres()) {
ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.model.composite;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -29,7 +29,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase {
client.setClientPK(new CkeClientKey(20, "susan")); client.setClientPK(new CkeClientKey(20, "susan"));
client.setUser(user1); client.setUser(user1);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(client); DB.save(client);
@@ -38,7 +38,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase {
DB.save(client); DB.save(client);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)"); assertSql(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)");
ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java
+3 -3
View File
@@ -4,7 +4,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonContext;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -25,11 +25,11 @@ public class EcmPersonTest extends BaseTestCase {
final EcmPerson person = json.toBean(EcmPerson.class, asJson); final EcmPerson person = json.toBean(EcmPerson.class, asJson);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(person); DB.save(person);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecm_person "); assertSql(sql.get(0)).contains("insert into ecm_person ");
ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java
+3 -3
View File
@@ -3,7 +3,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonContext;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -24,11 +24,11 @@ public class EcsPersonTest extends BaseTestCase {
final EcsPerson person = json.toBean(EcsPerson.class, asJson); final EcsPerson person = json.toBean(EcsPerson.class, asJson);
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(person); DB.save(person);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecs_person "); assertSql(sql.get(0)).contains("insert into ecs_person ");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java
+19 -19
View File
@@ -3,7 +3,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.Transaction; import io.ebean.Transaction;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -23,10 +23,10 @@ public class TestElementCollectionBasic extends BaseTestCase {
person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 1234");
person.getPhoneNumbers().add("021 4321"); person.getPhoneNumbers().add("021 4321");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(eventLog()).containsOnly("preInsert", "postInsert"); assertThat(eventLog()).containsOnly("preInsert", "postInsert");
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
@@ -37,7 +37,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
found.getPhoneNumbers().size(); found.getPhoneNumbers().size();
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("from ec_person t0 where t0.id = ?"); assertSql(sql.get(0)).contains("from ec_person t0 where t0.id = ?");
assertSql(sql.get(1)).contains("from ec_person_phone t0 where"); assertSql(sql.get(1)).contains("from ec_person_phone t0 where");
@@ -45,7 +45,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
// save when not actually changed // save when not actually changed
DB.save(found); DB.save(found);
sql = LoggedSqlCollector.stop(); sql = LoggedSql.stop();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
assertThat(eventLog()).isEmpty(); assertThat(eventLog()).isEmpty();
} }
@@ -54,7 +54,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
public void test() { public void test() {
eventLog(); eventLog();
LoggedSqlCollector.start(); LoggedSql.start();
EcPerson person = new EcPerson("Fiona021"); EcPerson person = new EcPerson("Fiona021");
person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 1234");
@@ -63,7 +63,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
assertThat(eventLog()).containsExactly("preInsert", "postInsert"); assertThat(eventLog()).containsExactly("preInsert", "postInsert");
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ec_person"); assertSql(sql.get(0)).contains("insert into ec_person");
@@ -83,7 +83,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
assertThat(eventLog()).containsExactly("preInsert", "postInsert"); assertThat(eventLog()).containsExactly("preInsert", "postInsert");
LoggedSqlCollector.current(); LoggedSql.collect();
List<EcPerson> found = List<EcPerson> found =
DB.find(EcPerson.class).where() DB.find(EcPerson.class).where()
@@ -98,7 +98,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ec_person t0 where"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ec_person t0 where");
assertSql(sql.get(1)).contains("select t0.owner_id, t0.phone from ec_person_phone t0 where"); assertSql(sql.get(1)).contains("select t0.owner_id, t0.phone from ec_person_phone t0 where");
@@ -113,7 +113,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
assertThat(found2).hasSize(2); assertThat(found2).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ec_person t0 left join ec_person_phone t1"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ec_person t0 left join ec_person_phone t1");
@@ -122,7 +122,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
jsonToFrom(foundFirst); jsonToFrom(foundFirst);
updateBasic(foundFirst); updateBasic(foundFirst);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
private void updateBasic(EcPerson bean) { private void updateBasic(EcPerson bean) {
@@ -130,7 +130,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
bean.setName("Fiona021-mod-0"); bean.setName("Fiona021-mod-0");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update ec_person"); assertSql(sql.get(0)).contains("update ec_person");
@@ -148,7 +148,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
txn.commit(); txn.commit();
} }
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("update ec_person"); assertSql(sql.get(0)).contains("update ec_person");
@@ -163,7 +163,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
bean.getPhoneNumbers().add("01-22123"); bean.getPhoneNumbers().add("01-22123");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
@@ -196,7 +196,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
txn.commit(); txn.commit();
} }
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(9); assertThat(sql).hasSize(9);
assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?");
assertSql(sql.get(2)).contains("delete from ec_person_phone where owner_id=?"); assertSql(sql.get(2)).contains("delete from ec_person_phone where owner_id=?");
@@ -213,7 +213,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
assertThat(eventLog()).isEmpty(); assertThat(eventLog()).isEmpty();
@@ -230,7 +230,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
txn.commit(); txn.commit();
} }
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(8); assertThat(sql).hasSize(8);
assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
assertSqlBind(sql, 1); assertSqlBind(sql, 1);
@@ -247,7 +247,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
bean.getPhoneNumbers().add("01-4321"); bean.getPhoneNumbers().add("01-4321");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(9); assertThat(sql).hasSize(9);
assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?");
@@ -275,7 +275,7 @@ public class TestElementCollectionBasic extends BaseTestCase {
DB.delete(bean); DB.delete(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id = ?"); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id = ?");
assertSql(sql.get(1)).contains("delete from ec_person where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ec_person where id=? and version=?");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+9 -9
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.PersistBatch; import io.ebean.annotation.PersistBatch;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -27,7 +27,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
one.getPhoneNumbers().size(); one.getPhoneNumbers().size();
LoggedSqlCollector.start(); LoggedSql.start();
EcPerson two = DB.find(EcPerson.class) EcPerson two = DB.find(EcPerson.class)
.setId(person.getId()) .setId(person.getId())
@@ -36,12 +36,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
two.setName("CacheMod"); two.setName("CacheMod");
two.getPhoneNumbers().add("027 234234"); two.getPhoneNumbers().add("027 234234");
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit containing phone numbers assertThat(sql).isEmpty(); // cache hit containing phone numbers
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSqlBind(sql, 4, 6); assertSqlBind(sql, 4, 6);
@@ -51,7 +51,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // no change assertThat(sql).isEmpty(); // no change
EcPerson three = DB.find(EcPerson.class) EcPerson three = DB.find(EcPerson.class)
@@ -61,13 +61,13 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getName()).isEqualTo("CacheMod");
assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234"); assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
three.getPhoneNumbers().add("09 6534"); three.getPhoneNumbers().add("09 6534");
DB.save(three); DB.save(three);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); // cache hit assertThat(sql).hasSize(7); // cache hit
} else { } else {
@@ -82,12 +82,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
assertThat(four.getName()).isEqualTo("CacheMod"); assertThat(four.getName()).isEqualTo("CacheMod");
assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534"); assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
DB.delete(four); DB.delete(four);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
@Override @Override
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+12 -12
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.HashMap; import java.util.HashMap;
@@ -16,14 +16,14 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
@Test @Test
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
EcmPerson person = new EcmPerson("MFiona021"); EcmPerson person = new EcmPerson("MFiona021");
person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("home", "021 1234");
person.getPhoneNumbers().put("work", "021 4321"); person.getPhoneNumbers().put("work", "021 4321");
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecm_person"); assertSql(sql.get(0)).contains("insert into ecm_person");
@@ -42,7 +42,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
person1.getPhoneNumbers().put("mob", "09 9876"); person1.getPhoneNumbers().put("mob", "09 9876");
DB.save(person1); DB.save(person1);
LoggedSqlCollector.current(); LoggedSql.collect();
List<EcmPerson> found = List<EcmPerson> found =
DB.find(EcmPerson.class).where() DB.find(EcmPerson.class).where()
@@ -61,7 +61,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
assertThat(phoneNumbers1).containsValues("09 1234", "09 4321", "09 9876"); assertThat(phoneNumbers1).containsValues("09 1234", "09 4321", "09 9876");
assertThat(phoneNumbers1.get("mob")).isEqualTo("09 9876"); assertThat(phoneNumbers1.get("mob")).isEqualTo("09 9876");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecm_person t0 where"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecm_person t0 where");
assertSql(sql.get(1)).contains("select t0.ecm_person_id, t0.type, t0.phnum from ecm_person_phone_numbers t0 where"); assertSql(sql.get(1)).contains("select t0.ecm_person_id, t0.type, t0.phnum from ecm_person_phone_numbers t0 where");
@@ -76,7 +76,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
assertThat(found2).hasSize(2); assertThat(found2).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.type, t1.phnum from ecm_person t0 left join ecm_person_phone_numbers t1"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.type, t1.phnum from ecm_person t0 left join ecm_person_phone_numbers t1");
@@ -84,7 +84,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
jsonToFrom(foundFirst); jsonToFrom(foundFirst);
updateBasic(foundFirst); updateBasic(foundFirst);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
private void updateBasic(EcmPerson bean) { private void updateBasic(EcmPerson bean) {
@@ -92,7 +92,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
bean.setName("Fiona021-mod-0"); bean.setName("Fiona021-mod-0");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update ecm_person"); assertSql(sql.get(0)).contains("update ecm_person");
@@ -105,7 +105,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
bean.getPhoneNumbers().put("one", "01-22123"); bean.getPhoneNumbers().put("one", "01-22123");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?");
@@ -129,7 +129,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
updateOnlyCollection(bean); updateOnlyCollection(bean);
@@ -140,7 +140,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
bean.getPhoneNumbers().put("two", "01-4321"); bean.getPhoneNumbers().put("two", "01-4321");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?"); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?");
@@ -163,7 +163,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
DB.delete(bean); DB.delete(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id = ?"); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id = ?");
assertSql(sql.get(1)).contains("delete from ecm_person where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecm_person where id=? and version=?");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java
+4 -4
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -14,14 +14,14 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
@Test @Test
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
EcmcPerson person = new EcmcPerson("Lob021"); EcmcPerson person = new EcmcPerson("Lob021");
person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("home", "021 1234");
person.getPhoneNumbers().put("work", "021 4321"); person.getPhoneNumbers().put("work", "021 4321");
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecmc_person"); assertSql(sql.get(0)).contains("insert into ecmc_person");
@@ -34,7 +34,7 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase {
assertSql(sql.get(2)).contains("insert into ecmc_person_phone"); assertSql(sql.get(2)).contains("insert into ecmc_person_phone");
} }
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
} }
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+9 -9
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.PersistBatch; import io.ebean.annotation.PersistBatch;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -29,7 +29,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
one.getPhoneNumbers().size(); one.getPhoneNumbers().size();
LoggedSqlCollector.start(); LoggedSql.start();
EcmPerson two = DB.find(EcmPerson.class) EcmPerson two = DB.find(EcmPerson.class)
.setId(person.getId()) .setId(person.getId())
@@ -38,12 +38,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
two.setName("CacheMod"); two.setName("CacheMod");
two.getPhoneNumbers().put("mob", "027 234234"); two.getPhoneNumbers().put("mob", "027 234234");
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit containing phone numbers assertThat(sql).isEmpty(); // cache hit containing phone numbers
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSqlBind(sql, 4, 6); assertSqlBind(sql, 4, 6);
@@ -53,7 +53,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // no change assertThat(sql).isEmpty(); // no change
EcmPerson three = DB.find(EcmPerson.class) EcmPerson three = DB.find(EcmPerson.class)
@@ -63,7 +63,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getName()).isEqualTo("CacheMod");
assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234"); assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
three.getPhoneNumbers().put("oth", "09 6534"); three.getPhoneNumbers().put("oth", "09 6534");
@@ -71,7 +71,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
three.getPhoneNumbers().remove("work"); three.getPhoneNumbers().remove("work");
DB.save(three); DB.save(three);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(5); // cache hit assertThat(sql).hasSize(5); // cache hit
assertSqlBind(sql, 3, 4); assertSqlBind(sql, 3, 4);
@@ -88,12 +88,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
assertThat(four.getPhoneNumbers().toString()).contains("027 234234", "09 6534"); assertThat(four.getPhoneNumbers().toString()).contains("027 234234", "09 6534");
assertThat(four.getPhoneNumbers()).hasSize(2); assertThat(four.getPhoneNumbers()).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
DB.delete(four); DB.delete(four);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
@Override @Override
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+12 -12
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -15,14 +15,14 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
@Test @Test
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
EcsPerson person = new EcsPerson("Fiona021"); EcsPerson person = new EcsPerson("Fiona021");
person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 1234");
person.getPhoneNumbers().add("021 4321"); person.getPhoneNumbers().add("021 4321");
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecs_person"); assertSql(sql.get(0)).contains("insert into ecs_person");
@@ -41,7 +41,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
person1.getPhoneNumbers().add("09 9876"); person1.getPhoneNumbers().add("09 9876");
DB.save(person1); DB.save(person1);
LoggedSqlCollector.current(); LoggedSql.collect();
List<EcsPerson> found = List<EcsPerson> found =
DB.find(EcsPerson.class).where() DB.find(EcsPerson.class).where()
@@ -56,7 +56,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321");
assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecs_person t0 where"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecs_person t0 where");
assertSql(sql.get(1)).contains("select t0.ecs_person_id, t0.phone from ecs_person_phone t0 where"); assertSql(sql.get(1)).contains("select t0.ecs_person_id, t0.phone from ecs_person_phone t0 where");
@@ -71,7 +71,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
assertThat(found2).hasSize(2); assertThat(found2).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ecs_person t0 left join ecs_person_phone t1"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version, t1.phone from ecs_person t0 left join ecs_person_phone t1");
@@ -80,7 +80,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
updateBasic(foundFirst); updateBasic(foundFirst);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
private void updateBasic(EcsPerson bean) { private void updateBasic(EcsPerson bean) {
@@ -88,7 +88,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
bean.setName("Fiona021-mod-0"); bean.setName("Fiona021-mod-0");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update ecs_person"); assertSql(sql.get(0)).contains("update ecs_person");
@@ -101,7 +101,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
bean.getPhoneNumbers().add("01-22123"); bean.getPhoneNumbers().add("01-22123");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?");
@@ -125,7 +125,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
updateOnlyCollection(bean); updateOnlyCollection(bean);
@@ -136,7 +136,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
bean.getPhoneNumbers().add("01-4321"); bean.getPhoneNumbers().add("01-4321");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?"); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?");
@@ -159,7 +159,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
DB.delete(bean); DB.delete(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id = ?"); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id = ?");
assertSql(sql.get(1)).contains("delete from ecs_person where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecs_person where id=? and version=?");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java
+3 -3
View File
@@ -3,7 +3,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.Transactional; import io.ebean.annotation.Transactional;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -24,11 +24,11 @@ public class TestElementCollectionCascadeMultiple extends BaseTestCase {
top.setPerson(person); top.setPerson(person);
top.getPeople().add(person); top.getPeople().add(person);
LoggedSqlCollector.start(); LoggedSql.start();
save(top); save(top);
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(9); assertThat(sql).hasSize(9);
assertSql(sql.get(0)).contains("insert into ecs_person"); assertSql(sql.get(0)).contains("insert into ecs_person");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+12 -12
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -14,14 +14,14 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
@Test @Test
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
EcblPerson person = new EcblPerson("Fiona64021"); EcblPerson person = new EcblPerson("Fiona64021");
person.getPhoneNumbers().add(new EcPhone("64", "021", "1234")); person.getPhoneNumbers().add(new EcPhone("64", "021", "1234"));
person.getPhoneNumbers().add(new EcPhone("64", "021", "4321")); person.getPhoneNumbers().add(new EcPhone("64", "021", "4321"));
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecbl_person"); assertSql(sql.get(0)).contains("insert into ecbl_person");
@@ -39,7 +39,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
person1.getPhoneNumbers().add(new EcPhone("64", "09", "4321")); person1.getPhoneNumbers().add(new EcPhone("64", "09", "4321"));
DB.save(person1); DB.save(person1);
LoggedSqlCollector.current(); LoggedSql.collect();
List<EcblPerson> found = List<EcblPerson> found =
DB.find(EcblPerson.class).where() DB.find(EcblPerson.class).where()
@@ -54,7 +54,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
assertThat(phoneNumbers0.toString()).contains("64-021-1234", "64-021-4321"); assertThat(phoneNumbers0.toString()).contains("64-021-1234", "64-021-4321");
assertThat(phoneNumbers1.toString()).contains("61-09-1234", "64-09-4321"); assertThat(phoneNumbers1.toString()).contains("61-09-1234", "64-09-4321");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecbl_person"); assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.version from ecbl_person");
assertSql(sql.get(1)).contains("select t0.person_id, t0.country_code, t0.area, t0.phnum from ecbl_person_phone_numbers"); assertSql(sql.get(1)).contains("select t0.person_id, t0.country_code, t0.area, t0.phnum from ecbl_person_phone_numbers");
@@ -69,7 +69,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
assertThat(found2).hasSize(2); assertThat(found2).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
String trimmedSql = trimSql(sql.get(0)); String trimmedSql = trimSql(sql.get(0));
assertThat(trimmedSql).contains("select t0.id, t0.name, t0.version, t1.country_code, t1.area, t1.phnum from ecbl_person t0 left join ecbl_person_phone_numbers t1"); assertThat(trimmedSql).contains("select t0.id, t0.name, t0.version, t1.country_code, t1.area, t1.phnum from ecbl_person t0 left join ecbl_person_phone_numbers t1");
@@ -80,7 +80,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
updateBasic(foundFirst); updateBasic(foundFirst);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
private void updateBasic(EcblPerson bean) { private void updateBasic(EcblPerson bean) {
@@ -88,7 +88,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
bean.setName("Fiona64-mod-0"); bean.setName("Fiona64-mod-0");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update ecbl_person"); assertSql(sql.get(0)).contains("update ecbl_person");
@@ -101,7 +101,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
bean.getPhoneNumbers().add(new EcPhone("01", "234", "123")); bean.getPhoneNumbers().add(new EcPhone("01", "234", "123"));
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?");
@@ -125,7 +125,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
updateOnlyCollection(bean); updateOnlyCollection(bean);
@@ -136,7 +136,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321")); bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321"));
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
@@ -159,7 +159,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
DB.delete(bean); DB.delete(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id = ?"); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id = ?");
assertSql(sql.get(1)).contains("delete from ecbl_person where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecbl_person where id=? and version=?");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java
+9 -9
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -24,11 +24,11 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
.fetch("phoneNumbers") .fetch("phoneNumbers")
.findOne(); .findOne();
LoggedSqlCollector.start(); LoggedSql.start();
one.getPhoneNumbers().size(); one.getPhoneNumbers().size();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
EcblPerson two = DB.find(EcblPerson.class) EcblPerson two = DB.find(EcblPerson.class)
@@ -38,7 +38,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
two.getPhoneNumbers().size(); two.getPhoneNumbers().size();
assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
two.getPhoneNumbers().add(new EcPhone("61", "07", "11")); two.getPhoneNumbers().add(new EcPhone("61", "07", "11"));
@@ -46,7 +46,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(5); // update of collection only assertThat(sql).hasSize(5); // update of collection only
assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
@@ -67,7 +67,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-1234"); assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-1234");
assertThat(three.getPhoneNumbers()).hasSize(2); assertThat(three.getPhoneNumbers()).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
@@ -76,7 +76,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
DB.save(three); DB.save(three);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(5); assertThat(sql).hasSize(5);
EcblPerson four = DB.find(EcblPerson.class) EcblPerson four = DB.find(EcblPerson.class)
@@ -88,10 +88,10 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
DB.delete(four); DB.delete(four);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
} }
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+11 -11
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -15,14 +15,14 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
@Test @Test
public void test() { public void test() {
LoggedSqlCollector.start(); LoggedSql.start();
EcbmPerson person = new EcbmPerson("Fiona64021"); EcbmPerson person = new EcbmPerson("Fiona64021");
person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234")); person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234"));
person.getPhoneNumbers().put("work", new EcPhone("64","021","4321")); person.getPhoneNumbers().put("work", new EcPhone("64","021","4321"));
DB.save(person); DB.save(person);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(4); assertThat(sql).hasSize(4);
assertSql(sql.get(0)).contains("insert into ecbm_person"); assertSql(sql.get(0)).contains("insert into ecbm_person");
@@ -41,7 +41,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
DB.save(person1); DB.save(person1);
LoggedSqlCollector.current(); LoggedSql.collect();
List<EcbmPerson> found = List<EcbmPerson> found =
DB.find(EcbmPerson.class).where() DB.find(EcbmPerson.class).where()
@@ -67,13 +67,13 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
assertThat(found2).hasSize(2); assertThat(found2).hasSize(2);
EcbmPerson foundFirst = found2.get(0); EcbmPerson foundFirst = found2.get(0);
LoggedSqlCollector.current(); LoggedSql.collect();
jsonToFrom(foundFirst); jsonToFrom(foundFirst);
updateBasic(foundFirst); updateBasic(foundFirst);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
private void updateBasic(EcbmPerson bean) { private void updateBasic(EcbmPerson bean) {
@@ -81,7 +81,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
bean.setName("Fiona64-mod-0"); bean.setName("Fiona64-mod-0");
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("update ecbm_person"); assertSql(sql.get(0)).contains("update ecbm_person");
@@ -94,7 +94,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
bean.getPhoneNumbers().put("more", new EcPhone("01", "234", "123")); bean.getPhoneNumbers().put("more", new EcPhone("01", "234", "123"));
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
@@ -117,7 +117,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(0); assertThat(sql).hasSize(0);
updateOnlyCollection(bean); updateOnlyCollection(bean);
@@ -128,7 +128,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321")); bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321"));
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(7); assertThat(sql).hasSize(7);
assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
@@ -151,7 +151,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
DB.delete(bean); DB.delete(bean);
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id = ?"); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id = ?");
assertSql(sql.get(1)).contains("delete from ecbm_person where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecbm_person where id=? and version=?");
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java
+9 -9
View File
@@ -2,7 +2,7 @@ package org.tests.model.elementcollection;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -25,11 +25,11 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
.fetch("phoneNumbers") .fetch("phoneNumbers")
.findOne(); .findOne();
LoggedSqlCollector.start(); LoggedSql.start();
one.getPhoneNumbers().size(); one.getPhoneNumbers().size();
List<String> sql = LoggedSqlCollector.current(); List<String> sql = LoggedSql.collect();
assertThat(sql).isEmpty(); assertThat(sql).isEmpty();
EcbmPerson two = DB.find(EcbmPerson.class) EcbmPerson two = DB.find(EcbmPerson.class)
@@ -39,7 +39,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
two.getPhoneNumbers().size(); two.getPhoneNumbers().size();
assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11")); two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11"));
@@ -47,7 +47,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
DB.save(two); DB.save(two);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
if (isPersistBatchOnCascade()) { if (isPersistBatchOnCascade()) {
assertThat(sql).hasSize(5); // update of collection only assertThat(sql).hasSize(5); // update of collection only
assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
@@ -69,7 +69,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-4321"); assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-4321");
assertThat(three.getPhoneNumbers()).hasSize(2); assertThat(three.getPhoneNumbers()).hasSize(2);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).isEmpty(); // cache hit assertThat(sql).isEmpty(); // cache hit
@@ -78,7 +78,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
DB.save(three); DB.save(three);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(5); assertThat(sql).hasSize(5);
EcbmPerson four = DB.find(EcbmPerson.class) EcbmPerson four = DB.find(EcbmPerson.class)
@@ -90,10 +90,10 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
DB.delete(four); DB.delete(four);
sql = LoggedSqlCollector.current(); sql = LoggedSql.collect();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
LoggedSqlCollector.stop(); LoggedSql.stop();
} }
} }
ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java
+3 -3
View File
@@ -2,7 +2,7 @@ package org.tests.model.embedded;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -17,10 +17,10 @@ public class TestEmbeddedAttrOverride extends BaseTestCase {
PrimaryRevision bean = new PrimaryRevision(100); PrimaryRevision bean = new PrimaryRevision(100);
bean.setName("hello"); bean.setName("hello");
LoggedSqlCollector.start(); LoggedSql.start();
DB.save(bean); DB.save(bean);
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1); assertThat(sql).hasSize(1);
assertSql(sql.get(0)).contains("insert into primary_revision (id, revision, name, version) values (?,?,?,?)"); assertSql(sql.get(0)).contains("insert into primary_revision (id, revision, name, version) values (?,?,?,?)");
} }
ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.plugin.BeanType; import io.ebean.plugin.BeanType;
import io.ebean.plugin.Property; import io.ebean.plugin.Property;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Country; import org.tests.model.basic.Country;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
@@ -37,7 +37,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
DB.save(perAddr); DB.save(perAddr);
LoggedSqlCollector.start(); LoggedSql.start();
EPerAddr found = DB.find(EPerAddr.class, perAddr.getId()); EPerAddr found = DB.find(EPerAddr.class, perAddr.getId());
@@ -45,7 +45,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
assertThat(found.getAddress().getCountry().getName()).startsWith("New"); assertThat(found.getAddress().getCountry().getName()).startsWith("New");
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(2); assertThat(sql).hasSize(2);
if (isH2()) { if (isH2()) {
ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java
+3 -3
View File
@@ -6,7 +6,7 @@ import io.ebean.ValuePair;
import io.ebean.Version; import io.ebean.Version;
import io.ebean.annotation.ForPlatform; import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.List; import java.util.List;
@@ -33,13 +33,13 @@ public class TestHistoryEmbeddedId extends BaseTestCase {
assertNotNull(found); assertNotNull(found);
assertThat(found.getName()).isEqualTo("notTen"); assertThat(found.getName()).isEqualTo("notTen");
LoggedSqlCollector.start(); LoggedSql.start();
final List<Version<HEmbiBean>> versions = final List<Version<HEmbiBean>> versions =
DB.find(HEmbiBean.class) DB.find(HEmbiBean.class)
.setId(id) .setId(id)
.findVersions(); .findVersions();
final List<String> sql = LoggedSqlCollector.stop(); final List<String> sql = LoggedSql.stop();
assertThat(versions).hasSize(2); assertThat(versions).hasSize(2);
final Map<String, ValuePair> diff = versions.get(0).getDiff(); final Map<String, ValuePair> diff = versions.get(0).getDiff();
ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.DB; import io.ebean.DB;
import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform; import io.ebean.annotation.Platform;
import org.ebeantest.LoggedSqlCollector; import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.sql.Timestamp; import java.sql.Timestamp;
@@ -40,7 +40,7 @@ public class TestHistoryOneToMany extends BaseTestCase {
DB.save(one); DB.save(one);
Thread.sleep(20); Thread.sleep(20);
LoggedSqlCollector.start(); LoggedSql.start();
List<HiTOne> list = DB.find(HiTOne.class) List<HiTOne> list = DB.find(HiTOne.class)
.fetch("twos") .fetch("twos")
@@ -50,7 +50,7 @@ public class TestHistoryOneToMany extends BaseTestCase {
.asOf(new Timestamp(System.currentTimeMillis())) .asOf(new Timestamp(System.currentTimeMillis()))
.findList(); .findList();
List<String> sql = LoggedSqlCollector.stop(); List<String> sql = LoggedSql.stop();
assertThat(list).hasSize(1); assertThat(list).hasSize(1);
assertThat(list.get(0).getTwos()).hasSize(2); assertThat(list.get(0).getTwos()).hasSize(2);
Loaded 100 of 163 files, more files were not shown because too many files have changed in this diff. Show more