From 1696caadd4ec7386ce1d31534bfb4d1d53d23cbd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 9 Sep 2021 11:25:04 +1200 Subject: [PATCH] #2361 - Tidy tests only, move to LoggedSql (ebean-test) --- .../src/test/java/io/ebean/DtoQuery2Test.java | 18 +++--- .../java/io/ebean/DtoQueryFromOrmTest.java | 38 +++++------ .../src/test/java/io/ebean/DtoQueryTest.java | 10 +-- .../ebean/EbeanServer_deleteAllByIdTest.java | 22 +++---- .../io/ebean/EbeanServer_deleteByIdTest.java | 18 +++--- .../java/io/ebean/EbeanServer_deleteTest.java | 10 +-- .../java/io/ebean/EbeanServer_eqlTest.java | 10 +-- .../io/ebean/EbeanServer_saveAllTest.java | 36 +++++------ .../test/java/io/ebean/FetchGroupTest.java | 18 +++--- .../io/ebean/TestUnsetLoadedProperties.java | 10 +-- .../test/java/io/ebean/UpdateQueryTest.java | 22 +++---- .../IsEmptyExpressionQueryTest.java | 6 +- .../server/expression/NoopExpressionTest.java | 6 +- .../server/grammer/EqlParserTest.java | 6 +- .../test/java/io/ebeantest/CaptureLogger.java | 64 ------------------- .../io/ebeantest/CapturingLoggerFactory.java | 22 ------- .../src/test/java/io/ebeantest/LoggedSql.java | 31 --------- .../org/ebeantest/LoggedSqlCollector.java | 36 ----------- .../partition/MultiTenantPartitionTest.java | 20 +++--- .../TestAggregateFormula.java | 34 +++++----- .../TestAggregateInheritFormula.java | 6 +- .../java/org/tests/basic/TestFetchId.java | 2 +- .../org/tests/basic/TestQueryForUpdate.java | 6 +- .../org/tests/basic/encrypt/TestEncrypt.java | 10 +-- .../tests/basic/event/TestQueryAdapter.java | 8 +-- .../basic/lob/TestBasicClobFetchEager.java | 10 +-- .../tests/basic/lob/TestBasicClobNoVer.java | 6 +- .../batchinsert/TestBatchInsertFlush.java | 48 +++++++------- ...tBatchInsertWithInitialisedCollection.java | 6 +- .../batchload/TestBatchLazyWithCacheHits.java | 6 +- .../batchload/TestQueryDisableLazyLoad.java | 14 ++-- .../batchload/TestQueryJoinToAssocOne.java | 30 ++++----- .../tests/batchload/TestSecondaryQueries.java | 26 ++++---- .../java/org/tests/cache/TestBeanCache.java | 20 +++--- .../cache/TestBeanCacheContactLazyLoad.java | 2 +- .../cache/TestBeanCacheWithDeleteQuery.java | 18 +++--- .../tests/cache/TestBeanFetchJoinCache.java | 24 +++---- .../java/org/tests/cache/TestQueryCache.java | 34 +++++----- .../cache/personinfo/PersonCacheTests.java | 8 +-- .../tests/cascade/TestMultiCascadeBatch.java | 6 +- .../org/tests/cascade/TestOrderedList.java | 20 +++--- .../org/tests/cascade/TestPrivateOwned.java | 10 +-- .../org/tests/changelog/TestChangeLog.java | 2 +- .../org/tests/ddl/TestForeignKeyModes.java | 10 +-- .../org/tests/defaultvalues/TestDefaults.java | 6 +- .../org/tests/delete/TestDeleteByQuery.java | 38 +++++------ .../delete/TestDeleteCascadeWithListener.java | 6 +- .../java/org/tests/draftable/DocLinkTest.java | 6 +- .../org/tests/history/TestHistoryInsert.java | 2 +- .../inheritance/TestInheritanceOnMany.java | 14 ++-- .../TestInheritanceOrderColumn.java | 10 +-- .../inheritance/TestInheritanceQuery.java | 6 +- .../inheritance/TestInheritanceRefBean.java | 10 +-- .../bothsides/TestInheritanceBothSides.java | 10 +-- .../cache/TestInheritanceRefCache.java | 22 +++---- .../org/tests/insert/TestOnlyIdEntity.java | 6 +- .../java/org/tests/iud/TestCarWheelIud.java | 6 +- .../org/tests/iud/TestPersistCascade.java | 6 +- .../org/tests/json/TestDbJson_Jackson3.java | 2 +- .../java/org/tests/json/TestDbJson_List.java | 18 +++--- .../java/org/tests/json/TestJsonMapBasic.java | 2 +- .../lazyforeignkeys/TestLazyForeignKeys.java | 6 +- .../org/tests/m2m/TestM2MDeleteNoCascade.java | 14 ++-- .../tests/m2m/TestM2MDistinct_sqlServer.java | 2 +- .../java/org/tests/merge/TestMergeBasic.java | 10 +-- .../org/tests/merge/TestMergeCustomer.java | 42 ++++++------ .../java/org/tests/merge/TestMergeM2M.java | 8 +-- .../aggregation/TestAggregationMany.java | 14 ++-- .../aggregation/TestAggregationTopLevel.java | 30 ++++----- .../tests/model/array/TestDbArray_asSet.java | 10 +-- .../tests/model/array/TestDbArray_basic.java | 10 +-- .../cache/TestCacheViaComplexNaturalKey.java | 18 +++--- .../cache/TestCacheViaComplexNaturalKey3.java | 34 +++++----- .../basic/cache/TestCacheWithSoftDelete.java | 2 +- .../cache/TestNatKeyCacheWithForeignKey.java | 14 ++-- .../model/basic/cache/TestNatKeyUid.java | 6 +- .../TestInsertBatchThenFlushThenUpdate.java | 12 ++-- .../basic/xtra/TestInsertBatchThenUpdate.java | 14 ++-- ...TestInsertBatchWithDifferentRootTypes.java | 10 +-- .../tests/model/bridge/TestIdClassScalar.java | 14 ++-- .../TestInheritSoftDeleteJoin.java | 2 +- .../TestMTOInheritNoDiscriminator.java | 6 +- .../composite/TestCompositeKeyUserClient.java | 6 +- .../elementcollection/EcmPersonTest.java | 6 +- .../elementcollection/EcsPersonTest.java | 6 +- .../TestElementCollectionBasic.java | 38 +++++------ .../TestElementCollectionBasicCache.java | 18 +++--- .../TestElementCollectionBasicMap.java | 24 +++---- .../TestElementCollectionBasicMapAsLob.java | 8 +-- .../TestElementCollectionBasicMapCache.java | 18 +++--- .../TestElementCollectionBasicSet.java | 24 +++---- .../TestElementCollectionCascadeMultiple.java | 6 +- .../TestElementCollectionEmbeddedList.java | 24 +++---- ...estElementCollectionEmbeddedListCache.java | 18 +++--- .../TestElementCollectionEmbeddedMap.java | 22 +++---- ...TestElementCollectionEmbeddedMapCache.java | 18 +++--- .../embedded/TestEmbeddedAttrOverride.java | 6 +- .../model/embedded/TestEmbeddedManyToOne.java | 6 +- .../model/history/TestHistoryEmbeddedId.java | 6 +- .../model/history/TestHistoryOneToMany.java | 6 +- .../model/json/TestJacksonPlainBean.java | 2 +- .../org/tests/model/m2m/TestM2MWithWhere.java | 2 +- .../TestOneToOneImportedPkNative.java | 6 +- .../TestOneToOneOptionalRelationship.java | 14 ++-- .../onetoone/TestOneToOneOrphanRemove.java | 8 +-- .../onetoone/TestOneToOneOrphanStringId.java | 20 +++--- .../onetoone/TestOneToOnePrimaryKeyJoin.java | 6 +- .../TestOneToOnePrimaryKeyJoinBidi.java | 6 +- .../TestOneToOnePrimaryKeyJoinOptional.java | 6 +- .../album/DeleteById_SoftDelete_Tests.java | 58 ++++++++--------- .../album/TestOneToOneHardDelete.java | 10 +-- .../orphanremoval/TestOrphanRemoveO2M.java | 6 +- .../org/tests/model/site/TestTreeModel.java | 6 +- .../tests/o2m/TestOneToManyNoMappedBy.java | 6 +- .../org/tests/o2m/TestOneToManyWhere.java | 2 +- .../o2m/jointable/TestOneToManyJoinTable.java | 20 +++--- .../TestOneToManyJoinTableInheritance.java | 6 +- .../TestOneToManyJoinTableNoTableName.java | 12 ++-- .../o2o/TestOneToOneSaveWithoutChanges.java | 6 +- .../java/org/tests/o2o/TestReferenceSave.java | 6 +- .../java/org/tests/order/TestOrderColumn.java | 10 +-- .../TestAddOrderByWithFirstRowsMaxRows.java | 34 +++++----- .../java/org/tests/query/TestOuterJoin.java | 2 +- .../org/tests/query/TestQueryBaseTable.java | 6 +- .../java/org/tests/query/TestQueryExists.java | 2 +- .../query/TestQueryFetchManyTwoDeep.java | 6 +- .../org/tests/query/TestQueryFilterMany.java | 46 ++++++------- .../org/tests/query/TestQueryFindEach.java | 14 ++-- .../org/tests/query/TestQueryFindIterate.java | 10 +-- .../org/tests/query/TestQueryFindNative.java | 38 +++++------ .../tests/query/TestQueryFindPagedList.java | 18 +++--- .../org/tests/query/TestWhereRawClause.java | 6 +- .../aggregation/TestAggregationCount.java | 35 +++++----- .../query/finder/TestCustomerFinder.java | 8 +-- .../query/joins/TestQueryJoinManyNonRoot.java | 6 +- .../query/joins/TestQueryJoinOnFormula.java | 54 ++++++++-------- .../query/orderby/TestOrderByWithMany.java | 6 +- .../other/TestQueryConversationRowCount.java | 6 +- .../other/TestQueryRawExpressionMany.java | 6 +- .../other/TestQueryRowCountWithMany.java | 10 +-- .../query/other/TestWhereAnnotation.java | 10 +-- .../softdelete/TestSoftDeletePagingList.java | 6 +- .../tests/query/sqlquery/SqlQueryTests.java | 22 +++---- .../org/tests/rawsql/TestRawSqlOrmQuery.java | 14 ++-- .../rawsql/nativesql/TestNativeSqlBasic.java | 8 +-- .../nativesql/TestNativeWithEmbedded.java | 6 +- .../org/tests/readaudit/TestReadAudit.java | 6 +- .../tests/softdelete/TestSoftDeleteBasic.java | 38 +++++------ .../softdelete/TestSoftDeleteManyToMany.java | 6 +- .../TestSoftDeleteOptionalRelationship.java | 6 +- .../softdelete/TestSoftDeleteOtoCascade.java | 6 +- .../TestSoftDeleteStatelessUpdate.java | 2 +- .../transaction/TestBatchModelFlush.java | 6 +- .../transaction/TestBatchPersistCascade.java | 6 +- .../tests/transaction/TestBeanStateReset.java | 6 +- .../transaction/TestTransactionSkipCache.java | 6 +- .../TestTransparentPersist.java | 2 +- .../test/java/org/tests/types/TestHstore.java | 10 +-- .../TestSqlUpdateBindMultipleLists.java | 6 +- .../org/tests/update/TestSqlUpdateInTxn.java | 10 +-- .../org/tests/update/TestStatelessUpdate.java | 2 +- .../update/TestUpdateAllLoadedProperties.java | 10 +-- .../io.ebeaninternal.api.SpiLoggerFactory | 1 - 163 files changed, 1024 insertions(+), 1179 deletions(-) delete mode 100644 ebean-test/src/test/java/io/ebeantest/CaptureLogger.java delete mode 100644 ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java delete mode 100644 ebean-test/src/test/java/io/ebeantest/LoggedSql.java delete mode 100644 ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java delete mode 100644 ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory diff --git a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java index dd657f296..90a62f734 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); final int expectedCount = server().find(Customer.class).findCount(); - LoggedSqlCollector.start(); + LoggedSql.start(); int counter = 0; try (final QueryIterator iterator = server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) @@ -72,7 +72,7 @@ public class DtoQuery2Test extends BaseTestCase { assertThat(counter).isEqualTo(expectedCount); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -81,7 +81,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); final int expectedCount = server().find(Customer.class).findCount(); - LoggedSqlCollector.start(); + LoggedSql.start(); try (final Stream stream = server() @@ -96,7 +96,7 @@ public class DtoQuery2Test extends BaseTestCase { assertThat(names.size()).isEqualTo(expectedCount); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -105,12 +105,12 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) .findEach(it -> log.info("got " + it.getId() + " " + it.getName())); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -119,7 +119,7 @@ public class DtoQuery2Test extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") .setParameter("id", 0) .findEachWhile(customer -> { @@ -127,7 +127,7 @@ public class DtoQuery2Test extends BaseTestCase { return customer.getId() > 3; }); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java index c0caf65bd..f850e3e0b 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; 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.BeforeAll; import org.junit.jupiter.api.Test; @@ -76,7 +76,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(Contact.class) .select("email, concat(lastName, ISO_WEEK(?)) as lastName") @@ -86,7 +86,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(list).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); 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(); // -// LoggedSqlCollector.start(); +// LoggedSql.start(); // // List list = DB.find(Contact.class) // .select("email, concat(lastName, ISO_WEEK(:date)) as lastName") @@ -108,7 +108,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { // // assertThat(list).isNotEmpty(); // -// List sql = LoggedSqlCollector.stop(); +// List sql = LoggedSql.stop(); // assertThat(sql).hasSize(2); // 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) // 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(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); } @@ -145,7 +145,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) .where().isNotNull("email").order().asc("lastName") @@ -162,7 +162,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getId()).isGreaterThan(0); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); DtoQuery query = DB.find(Contact.class) .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -186,7 +186,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getFullName()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); } @@ -196,7 +196,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class).setLabel("emailFullName") .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -209,7 +209,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getFullName()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class) .select("id, email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email") @@ -240,7 +240,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getEmail()).isNotNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("select top 10 t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name") @@ -256,7 +256,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class) .select(concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("lastName").order() @@ -270,7 +270,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase { assertThat(dto.getEmail()).isNull(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contactDtos = DB.find(Contact.class).select("lastName, count(*) as totalCount").where() .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(); } - List sql = LoggedSqlCollector.stop(); + List 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(*) > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java index 4daa80eeb..53b2b4ca4 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,12 +57,12 @@ public class DtoQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id") .setParameter("id", 0) .findEach(it -> log.info("got " + it.getId() + " " + it.getName())); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } @@ -71,7 +71,7 @@ public class DtoQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().findDto(DCust.class, "select id, name from o_customer where id > :id order by id desc") .setParameter("id", 0) .findEachWhile(customer -> { @@ -79,7 +79,7 @@ public class DtoQueryTest extends BaseTestCase { return customer.getId() > 3; }); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select id, name from o_customer where id > ?"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index 7365f430c..61c9031d0 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -20,7 +20,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { final EBasicVer bean1 = bean("foo1"); final EBasicVer bean2 = bean("foo2"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(bean0, bean1, bean2); @@ -28,7 +28,7 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { assertNotNull(bean1.getId()); assertNotNull(bean2.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver"); assertSqlBind(loggedSql, 1, 3); @@ -52,10 +52,10 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(EBasicVer.class, ids); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -73,12 +73,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { Database db = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = db.beginTransaction()) { db.deleteAll(EBasicVer.class, ids, txn); txn.commit(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -94,11 +94,11 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { ids.add(someBean.getId()); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(EBasicVer.class, ids); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } @@ -117,12 +117,12 @@ public class EbeanServer_deleteAllByIdTest extends BaseTestCase { Database db = DB.getDefault(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = db.beginTransaction()) { db.deleteAllPermanent(EBasicVer.class, ids, txn); txn.commit(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); platformAssertIn(loggedSql.get(0), "delete from e_basicver where id "); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index ffe1a743f..dd7d461ef 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,10 +18,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(EBasicVer.class, someBean.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } @@ -33,10 +33,10 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deletePermanent(EBasicVer.class, someBean.getId()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); 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(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.delete(EBasicVer.class, someBean.getId(), txn); @@ -58,7 +58,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); 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(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.deletePermanent(EBasicVer.class, someBean.getId(), txn); @@ -79,7 +79,7 @@ public class EbeanServer_deleteByIdTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id = ?"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java index 427d4a4d0..e30c33aea 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,10 +18,10 @@ public class EbeanServer_deleteTest extends BaseTestCase { DB.save(someBean); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(someBean); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); 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(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = server.beginTransaction(); try { server.delete(someBean, txn); @@ -42,7 +42,7 @@ public class EbeanServer_deleteTest extends BaseTestCase { } finally { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=? and "); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java index 7aac81b95..c913e8495 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -88,9 +88,9 @@ public class EbeanServer_eqlTest extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from o_customer t0;"); } diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java index 603a3befa..474576b0c 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java @@ -1,6 +1,6 @@ package io.ebean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -19,11 +19,11 @@ public class EbeanServer_saveAllTest extends BaseTestCase { List someBeans = beans(3); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(someBeans); // assert - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -33,19 +33,19 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.updateAll(someBeans); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(3); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); // act - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(someBeans); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); 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()) { transaction.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); for (EBasicVer bean : beans(2)) { server.save(bean); } // jdbc batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); server.saveAll(beans(3)); // still batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); for (EBasicVer bean : beans(2)) { server.save(bean); } // still batch, no sql yet - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); // flush now transaction.commit(); // 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(); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.saveAll(someBeans, txn); txn.commit(); } // assert - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -130,23 +130,23 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.updateAll(someBeans, txn); txn.commit(); } - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(3); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, last_update=? where id=? "); // act - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = server.beginTransaction()) { server.deleteAll(someBeans, txn); txn.commit(); } - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); } diff --git a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java index 83ef87e2c..74744391e 100644 --- a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java @@ -1,7 +1,7 @@ package io.ebean; import io.ebean.service.SpiFetchGroupQuery; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -47,10 +47,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(fetch); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); 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"); @@ -75,10 +75,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(fetch); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer"); assertSql(sql.get(1)).contains(" from contact"); @@ -105,10 +105,10 @@ public class FetchGroupTest extends BaseTestCase { .ilike("name", "rob") .select(FBCustomer); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 "); } @@ -122,7 +122,7 @@ public class FetchGroupTest extends BaseTestCase { final FetchGroup fetchGroup = query.buildFetchGroup(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer.find .query() @@ -131,7 +131,7 @@ public class FetchGroupTest extends BaseTestCase { .select(fetchGroup) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where"); } diff --git a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java index dd21c5f99..38d6cc22a 100644 --- a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -3,7 +3,7 @@ package io.ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.converstation.User; @@ -37,10 +37,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { assertThat(beanState.loadedProps()).containsExactly("id", "name"); - LoggedSqlCollector.start(); + LoggedSql.start(); user.update(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("email"); } @@ -114,10 +114,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase { updUser.setName("mod occ"); updUser.markPropertyUnset("version"); - LoggedSqlCollector.start(); + LoggedSql.start(); updUser.save(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("where id=?;"); } } diff --git a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java index 75555d6c7..26fcd0324 100644 --- a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java @@ -5,7 +5,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -55,7 +55,7 @@ public class UpdateQueryTest extends BaseTestCase { UpdateQuery update = server().update(Customer.class); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = update .setRaw("status = status") @@ -63,7 +63,7 @@ public class UpdateQueryTest extends BaseTestCase { .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isGreaterThan(0); @@ -81,7 +81,7 @@ public class UpdateQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server().find(Customer.class) .where() @@ -92,7 +92,7 @@ public class UpdateQueryTest extends BaseTestCase { .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isEqualTo(0); @@ -103,7 +103,7 @@ public class UpdateQueryTest extends BaseTestCase { public void query_asUpdate_idIn() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server().find(Customer.class) .where() @@ -113,7 +113,7 @@ public class UpdateQueryTest extends BaseTestCase { .setLabel("asUpdateByIds") .update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(rows).isEqualTo(0); @@ -201,7 +201,7 @@ public class UpdateQueryTest extends BaseTestCase { Country nz = server.reference(Country.class, "NZ"); - LoggedSqlCollector.start(); + LoggedSql.start(); server.update(Customer.class) .set("status", Customer.Status.ACTIVE) @@ -211,7 +211,7 @@ public class UpdateQueryTest extends BaseTestCase { .setMaxRows(100) .update(); - final List sql = LoggedSqlCollector.stop(); + final List 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)"); } @@ -221,7 +221,7 @@ public class UpdateQueryTest extends BaseTestCase { Database server = server(); - LoggedSqlCollector.start(); + LoggedSql.start(); server.update(Customer.class) .set("status", Customer.Status.ACTIVE) @@ -230,7 +230,7 @@ public class UpdateQueryTest extends BaseTestCase { .setMaxRows(100) .update(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); if (isMySql() || isH2() || isMariaDB()) { assertSql(sql.get(0)).contains("update o_customer set status=? where id > ? limit 100"); } else { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index cdccac147..cf2a11e04 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -35,13 +35,13 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EUserNoFk.class) .where().isEmpty("files") .delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformSupportsDeleteTableAlias()) { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index 0583bdb35..69bbbf6db 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.onetoone.album.Cover; @@ -35,11 +35,11 @@ public class NoopExpressionTest extends BaseExpressionTest { .where().add(NoopExpression.INSTANCE) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 287ace7ed..1fea2b556 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiQuery; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; @@ -532,12 +532,12 @@ public class EqlParserTest extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = parse("select name fetch billingAddress (line1, city) fetch contacts (email) limit 10"); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(1)).contains("select t0.customer_id, t0.id, t0.email from contact t0 where (t0.customer_id)"); diff --git a/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java b/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java deleted file mode 100644 index 4f0454ccd..000000000 --- a/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java +++ /dev/null @@ -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 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 start() { - this.active = true; - return collect(); - } - - List stop() { - this.active = false; - return collect(); - } - - List collect() { - List response = messages; - messages = new ArrayList<>(); - return response; - } -} diff --git a/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java b/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java deleted file mode 100644 index ebbebd2fe..000000000 --- a/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java +++ /dev/null @@ -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; - } -} diff --git a/ebean-test/src/test/java/io/ebeantest/LoggedSql.java b/ebean-test/src/test/java/io/ebeantest/LoggedSql.java deleted file mode 100644 index db7cac92c..000000000 --- a/ebean-test/src/test/java/io/ebeantest/LoggedSql.java +++ /dev/null @@ -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 start() { - return sqlLogger.start(); - } - - public static List stop() { - return sqlLogger.stop(); - } - - public static List collect() { - return sqlLogger.collect(); - } - -} diff --git a/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java b/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java deleted file mode 100644 index d80253edf..000000000 --- a/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java +++ /dev/null @@ -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. - *

- * Used {@link #start()} and {@link #stop()} to collect the logged messages that contain the - * executed SQL statements. - *

- * 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 start() { - return LoggedSql.start(); - } - - /** - * Stop collection of the logged SQL statements return the list of captured messages that contain - * the SQL. - */ - public static List stop() { - return LoggedSql.stop(); - } - - public static List current() { - return LoggedSql.collect(); - } - -} diff --git a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 034dd6b1f..4e962ae92 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -5,7 +5,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; 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.Test; @@ -42,25 +42,25 @@ public class MultiTenantPartitionTest extends BaseTestCase { UserContext.set("rob", "ten_1"); - LoggedSqlCollector.start(); + LoggedSql.start(); MtContent content = new MtContent("first title"); server.save(content); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("insert into mt_content (title, body, when_modified, when_created, version, tenant_id) values (?,?,?,?,?,?)"); content.setBody("some body"); 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=?"); 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=?"); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Test @@ -71,10 +71,10 @@ public class MultiTenantPartitionTest extends BaseTestCase { MtContent content = new MtContent("first title"); server.save(content); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server.delete(MtContent.class, content.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); assertThat(rows).isEqualTo(1); @@ -93,11 +93,11 @@ public class MultiTenantPartitionTest extends BaseTestCase { List ids = Arrays.asList(a.getId(), b.getId(), 99998L); - LoggedSqlCollector.start(); + LoggedSql.start(); int rows = server.deleteAll(MtContent.class, ids); assertThat(rows).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("delete from mt_content where id=? and tenant_id=?"); } diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index c986a7438..8d5707da1 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; @@ -25,7 +25,7 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .setDistinct(true) @@ -33,7 +33,7 @@ public class TestAggregateFormula extends BaseTestCase { .order("min(customer) asc nulls last") .findList(); - List sql = LoggedSqlCollector.stop(); + List 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"); assertThat(contacts).isNotEmpty(); @@ -49,13 +49,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.last_name, min(t0.customer_id) from contact t0 group by t0.last_name"); assertThat(contacts).isNotEmpty(); @@ -71,7 +71,7 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") @@ -83,7 +83,7 @@ public class TestAggregateFormula extends BaseTestCase { assertNotNull(customer.getName()); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(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() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("lastName, min(customer)") @@ -117,7 +117,7 @@ public class TestAggregateFormula extends BaseTestCase { } } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(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(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("status, sum(id)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) from o_order t0 group by t0.status"); assertThat(orders).isNotEmpty(); @@ -156,13 +156,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("status, sum(id) as id") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.status, sum(t0.id) id from o_order t0 group by t0.status"); assertThat(orders).isNotEmpty(); @@ -177,13 +177,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("customer, min(cretime)") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.customer_id, min(t0.cretime) from contact t0 group by t0.customer_id"); assertThat(contacts).isNotEmpty(); @@ -194,13 +194,13 @@ public class TestAggregateFormula extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = DB.find(Contact.class) .select("customer, min(cretime), max(updtime)") .findList(); - List sql = LoggedSqlCollector.stop(); + List 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"); assertThat(contacts).isNotEmpty(); diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index 3735b5940..f7f9a3df7 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -2,7 +2,7 @@ package org.tests.aggregateformula; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -24,7 +24,7 @@ public class TestAggregateInheritFormula extends BaseTestCase { DB.saveAll(Arrays.asList(st0, st1, p0, p1)); - LoggedSqlCollector.start(); + LoggedSql.start(); List segments = DB.find(IAFPartialSegment.class) @@ -32,7 +32,7 @@ public class TestAggregateInheritFormula extends BaseTestCase { .where().eq("segmentIdZat", 108L) .findList(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); 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"); diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index 8467abad1..df3b48d8f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 37d424b31..bf53599b9 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -8,7 +8,7 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -54,7 +54,7 @@ public class TestQueryForUpdate extends BaseTestCase { try (Transaction transaction = DB.beginTransaction()) { - LoggedSqlCollector.start(); + LoggedSql.start(); EBasic basic0 = DB.find(EBasic.class, basic.getId()); assertThat(basic0).isNotNull(); @@ -67,7 +67,7 @@ public class TestQueryForUpdate extends BaseTestCase { assertThat(basic1).isNotNull(); assertThat(basic1).isSameAs(basic0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { assertSql(sql.get(0)).contains("from e_basic t0 where t0.id ="); diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index ca8a47f3b..e0f401256 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -7,7 +7,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; 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 public void testQueryBind() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EBasicEncrypt.class) .where().startsWith("description", "Rob") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); 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 public void testQueryJoin() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(EBasicEncryptRelate.class) .where().eq("other.description", "foo") @@ -49,7 +49,7 @@ public class TestEncrypt extends BaseTestCase { .where().eq("other.description", "foo") .findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); 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"); diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java index 0b106baad..f6050a161 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TOne; @@ -35,21 +35,21 @@ public class TestQueryAdapter extends BaseTestCase { Query notUsedQuery = DB.find(TOne.class); assertThat(notUsedQuery.getQueryType()).isEqualTo(QueryType.FIND); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.update(TOne.class) .set("name", "mod") .where().idEq(o.getId()) .update(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains(" 2=2"); DB.find(TOne.class) .where().idEq(o.getId()) .delete(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertSql(sql.get(0)).contains(" 3=3"); } diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 7dbc62c5e..eaf598cf4 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -35,13 +35,13 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertThat(sql).contains(expectedSql); - LoggedSqlCollector.start(); + LoggedSql.start(); // Same as previous query - clob included by default based on annotation DB.find(EBasicClobFetchEager.class, entity.getId()); // Assert query same as previous ... - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); @@ -66,13 +66,13 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertEquals("initialClobValue", entity.getDescription()); - LoggedSqlCollector.start(); + LoggedSql.start(); // Refresh query includes all properties server.refresh(entity); // Assert all properties fetched in refresh - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); assertEquals("modified", entity.getDescription()); diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index eed250046..66b741523 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.EBasicClobNoVer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -53,13 +53,13 @@ public class TestBasicClobNoVer extends BaseTestCase { assertThat(entity.getDescription()).isEqualTo("initialClobValue"); - LoggedSqlCollector.start(); + LoggedSql.start(); // Refresh query includes all properties DB.refresh(entity); // Assert all properties fetched in refresh - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 2)).contains(sqlWithClob); assertThat(entity.getDescription()).isEqualTo("modified"); diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index cbefd7a68..ac113e3a1 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -13,7 +13,7 @@ import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebeaninternal.api.SpiTransaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; @@ -42,7 +42,7 @@ public class TestBatchInsertFlush extends BaseTestCase { transaction.setBatchMode(true); transaction.setLabel("TestBatchInsertFlush.no_cascade"); - LoggedSqlCollector.start(); + LoggedSql.start(); TSMaster m = new TSMaster(); m.setName("master1"); @@ -65,7 +65,7 @@ public class TestBatchInsertFlush extends BaseTestCase { transaction.commit(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we get the 2 master inserts first 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) public void transactional_flushOnQueryFalse() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -103,7 +103,7 @@ public class TestBatchInsertFlush extends BaseTestCase { // does not trigger JDBC batch with flushOnQuery = false DB.find(Customer.class).findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*)"); } @@ -111,7 +111,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batchSize = 20) public void transactional_flushOnSqlQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -121,7 +121,7 @@ public class TestBatchInsertFlush extends BaseTestCase { .mapToScalar(Integer.class) .findOne(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -129,7 +129,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batchSize = 20) public void transactional_flushOnDtoQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); 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") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -146,7 +146,7 @@ public class TestBatchInsertFlush extends BaseTestCase { @Transactional(batch = PersistBatch.ALL) public void transactional_flushOnQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(new EBasicVer("b1")); DB.save(new EBasicVer("b2")); @@ -154,7 +154,7 @@ public class TestBatchInsertFlush extends BaseTestCase { // by default triggers flush of JDBC batch DB.find(Customer.class).findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); } @@ -164,7 +164,7 @@ public class TestBatchInsertFlush extends BaseTestCase { public void transactional_flushOnGetId() { Database server = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasicVer b1 = new EBasicVer("b1"); server.save(b1); @@ -173,10 +173,10 @@ public class TestBatchInsertFlush extends BaseTestCase { server.save(b2); //flush here - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(3); EBasicVer b3 = new EBasicVer("b3"); server.save(b3); @@ -189,7 +189,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { - LoggedSqlCollector.start(); + LoggedSql.start(); txn.setBatchMode(true); EBasicVer b1 = new EBasicVer("b1"); @@ -199,10 +199,10 @@ public class TestBatchInsertFlush extends BaseTestCase { server.save(b2, txn); //flush here - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(3); EBasicVer b3 = new EBasicVer("b3"); server.save(b3, txn); @@ -220,7 +220,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasicVer b1 = new EBasicVer("b1"); b1.setId(78965); @@ -230,11 +230,11 @@ public class TestBatchInsertFlush extends BaseTestCase { b2.setId(78645); server.save(b2); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); // dont flush here Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); EBasicVer b3 = new EBasicVer("b3"); server.save(b3); @@ -248,7 +248,7 @@ public class TestBatchInsertFlush extends BaseTestCase { Database server = DB.getDefault(); Transaction txn = server.beginTransaction(); try { - LoggedSqlCollector.start(); + LoggedSql.start(); txn.setBatchMode(true); EBasicVer b1 = new EBasicVer("b1"); @@ -259,17 +259,17 @@ public class TestBatchInsertFlush extends BaseTestCase { b2.setId(21354); server.save(b2, txn); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); //dont flush here Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSqlCollector.current()).isEmpty(); + assertThat(LoggedSql.collect()).isEmpty(); EBasicVer b3 = new EBasicVer("b3"); server.save(b3, txn); txn.commit(); - assertThat(LoggedSqlCollector.current()).hasSize(5); + assertThat(LoggedSql.collect()).hasSize(5); } finally { txn.end(); diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 3a8e70543..a4da626c3 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -3,7 +3,7 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; @@ -26,7 +26,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { list.add(bean); } - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = DB.beginTransaction(); try { @@ -39,7 +39,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into o_cached_bean ("); assertThat(loggedSql.get(0)).contains("name) values (?"); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 00307797e..aad2db190 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -41,7 +41,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { assertNotNull(DB.find(UUOne.class).where().idEq(inserted.get(2).getId()).findOne()); assertBeanCacheHits(1); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(UUOne.class) .select("id") @@ -55,7 +55,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { } list.get(0).getName(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from uuone t0 where t0.name like "); platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 359ca48e8..182800f35 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,7 +21,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -35,7 +35,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { List details = order.getDetails(); assertEquals(details.size(), 0); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(trimSql(loggedSql.get(0), 2)).contains("select t0.id, t0.status, t0.order_date,"); @@ -47,7 +47,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -61,7 +61,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { // normally invokes lazy loading assertNull(order.getCustomer().getStatus()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } @@ -70,7 +70,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List l0 = DB.find(Order.class) .setDisableLazyLoading(true) @@ -85,7 +85,7 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { // normally invokes lazy loading assertNull(order.getCustomer().getStatus()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } } diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index c1b5526e8..3814e262e 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -3,7 +3,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -25,7 +25,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -35,7 +35,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(l0).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -51,7 +51,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -62,7 +62,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(l0).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -77,7 +77,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -102,7 +102,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // normally invokes lazy loading order.getShipments().size(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); String secondaryQuery = trimSql(loggedSql.get(1), 1); @@ -117,7 +117,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -138,7 +138,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(details).isEmpty(); assertThat(details.size()).isEqualTo(0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -156,7 +156,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { DB.save(tenant); - LoggedSqlCollector.start(); + LoggedSql.start(); Tenant found = DB.find(Tenant.class) .setDisableLazyLoading(true) @@ -166,7 +166,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(found.getRoles().size()).isEqualTo(0); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -181,7 +181,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { u.getRoles().put("disableLazyLoading", r0); DB.save(u); - LoggedSqlCollector.start(); + LoggedSql.start(); MpUser found = DB.find(MpUser.class) .setDisableLazyLoading(true) @@ -193,7 +193,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { assertThat(found.getRoles().size()).isEqualTo(0); // only 1 query ... no lazy loading query - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); DB.deleteAll(Arrays.asList(found, r0)); @@ -204,7 +204,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // This will use 2 SQL queries to build this object graph List l0 = DB.find(Order.class) @@ -225,7 +225,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // normally invokes lazy loading orderDetail.getShipQty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); String originQuery = trimSql(loggedSql.get(0), 5); diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 3887aecc0..837341de1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.*; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -19,14 +19,14 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchQuery() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .select("status") .fetchQuery("customer", "name") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0"); @@ -37,7 +37,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchLazy() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.cacheManager().clearAll(); List orders = DB.find(Order.class) @@ -47,7 +47,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { .setUseCache(false) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { @@ -56,14 +56,14 @@ public class TestSecondaryQueries extends TransactionalTestCase { assertThat(trimSql(sql.get(0), 2)).contains("select t0.id, t0.status, t0.kcustomer_id from o_order t0"); } - LoggedSqlCollector.start(); + LoggedSql.start(); // invoke lazy loading for (Order order : orders) { order.getCustomer().getName(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.name from o_customer t0 where t0.id"); platformAssertIn(sql.get(0), " where t0.id"); @@ -72,7 +72,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { @Test public void fetchIterate() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (QueryIterator orders = DB.find(Order.class).select("status") @@ -84,7 +84,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { orders.next(); // dummy read } } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { @@ -105,12 +105,12 @@ public class TestSecondaryQueries extends TransactionalTestCase { .fetchQuery("contacts") .setId(custId); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer cust = query.findOne(); assertNotNull(cust); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); String generatedSql = query.getGeneratedSql(); assertThat(generatedSql).contains("from o_customer t0 where t0.id = ?"); @@ -133,7 +133,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = query.findList(); assertTrue(!list.isEmpty()); @@ -142,7 +142,7 @@ public class TestSecondaryQueries extends TransactionalTestCase { order.getCustomer().getStatus(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); String generatedSql = sqlOf(query, 2); //select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW) diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java index 7265bebe2..f36936807 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,16 +40,16 @@ public class TestBeanCache extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); // 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(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNotNull(bean2); assertThat(sql).isEmpty(); } @@ -92,7 +92,7 @@ public class TestBeanCache extends BaseTestCase { beanCache.clear(); beanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); log.info("All misses (0 of 3) ..."); List list = DB.find(OCachedBean.class) @@ -102,7 +102,7 @@ public class TestBeanCache extends BaseTestCase { assertThat(list).hasSize(3); assertBeanCacheHitMiss(0, 3); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { 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); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(0); // no misses // 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); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { // fetch the miss from DB @@ -149,7 +149,7 @@ public class TestBeanCache extends BaseTestCase { assertBeanCacheHitMiss(1, 2); assertThat(list).hasSize(3); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // fetch the misses from DB diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 232ca0e57..617737c52 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 6d7226323..905af3d8a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -2,7 +2,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; @@ -29,9 +29,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); @@ -41,9 +41,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertEquals(deleted, 1); // 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(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNull(bean2); assertThat(sql).isNotEmpty(); } @@ -59,9 +59,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertNotNull(bean0); // expect to hit the cache, no SQL - LoggedSqlCollector.start(); + LoggedSql.start(); OCachedBean bean1 = DB.find(OCachedBean.class, bean.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertNotNull(bean1); assertThat(sql).isEmpty(); @@ -71,9 +71,9 @@ public class TestBeanCacheWithDeleteQuery extends BaseTestCase { assertEquals(updated, 1); // 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(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertNotNull(bean2); assertThat(sql).isNotEmpty(); assertEquals("updatedName", bean2.getName()); diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index bbf3f08d8..c7a45d5e6 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -26,13 +26,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase { loadCustomerBeanCache(); customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer", "status, name") .findList(); - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(1); final ServerCacheStatistics statistics = customerBeanCache.statistics(true); @@ -46,7 +46,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(customer.getStatus()).isNotNull(); } - assertThat(LoggedSqlCollector.stop()).isEmpty(); + assertThat(LoggedSql.stop()).isEmpty(); } private void loadCustomerBeanCache() { @@ -66,13 +66,13 @@ public class TestBeanFetchJoinCache extends BaseTestCase { customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer") .findList(); - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(2); assertThat(sql0.get(0)).contains(" from o_order "); 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(LoggedSqlCollector.stop()).isEmpty(); + assertThat(LoggedSql.stop()).isEmpty(); } @Test @@ -100,7 +100,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .fetchCache("customer") @@ -109,7 +109,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { for (Order order : orders) { assertThat(order.getCustomer().getName()).isNotNull(); } - final List sql0 = LoggedSqlCollector.current(); + final List sql0 = LoggedSql.collect(); assertThat(sql0).hasSize(1); final ServerCacheStatistics statistics = customerBeanCache.statistics(true); @@ -124,7 +124,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { } // assert we hit the DB the second time around - final List sql1 = LoggedSqlCollector.stop(); + final List sql1 = LoggedSql.stop(); assertThat(sql1).hasSize(1); assertThat(sql1.get(0)).contains(" from o_customer t0 "); @@ -162,7 +162,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { initDataClearCache(); customerBeanCache.statistics(true); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select(fgCachePartial) @@ -173,7 +173,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getMissCount()).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains(" from o_order "); assertSql(sql.get(1)).contains(" from o_customer "); diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index 71ecc925d..f70bc44c7 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.bean.BeanCollection; import io.ebean.cache.ServerCache; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -104,7 +104,7 @@ public class TestQueryCache extends BaseTestCase { new EColAB("04", "count").save(); new EColAB("05", "count").save(); - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -118,20 +118,20 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "count") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(1); // and now, ensure that we hit the database - LoggedSqlCollector.start(); + LoggedSql.start(); int count2 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.OFF) .where() .eq("columnB", "count") .findCount(); assertThat(count2).isEqualTo(count1); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -139,7 +139,7 @@ public class TestQueryCache extends BaseTestCase { public void findCountDifferentQueries() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -153,7 +153,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "def") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); assertThat(sql).hasSize(2); // different queries @@ -164,7 +164,7 @@ public class TestQueryCache extends BaseTestCase { public void findCountFirstOnThenRecache() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -178,7 +178,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "uvw") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); 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() { - LoggedSqlCollector.start(); + LoggedSql.start(); int count0 = DB.find(EColAB.class) .setUseQueryCache(CacheMode.PUT) @@ -204,7 +204,7 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "xyz") .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(count0).isEqualTo(count1); 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("05", "someId").save(); - LoggedSqlCollector.start(); + LoggedSql.start(); List colA_first = DB.find(EColAB.class) .setUseQueryCache(CacheMode.ON) @@ -277,20 +277,20 @@ public class TestQueryCache extends BaseTestCase { .eq("columnB", "someId") .findIds(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(colA_first).isSameAs(colA_second); assertThat(colA_first).hasSize(3); assertThat(sql).hasSize(1); // and now, ensure that we hit the database - LoggedSqlCollector.start(); + LoggedSql.start(); colA_second = DB.find(EColAB.class) .setUseQueryCache(CacheMode.PUT) .where() .eq("columnB", "someId") .findIds(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } @@ -311,7 +311,7 @@ public class TestQueryCache extends BaseTestCase { } void differentFindCount(Consumer> q0, Consumer> q1) { - LoggedSqlCollector.start(); + LoggedSql.start(); ExpressionList el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where(); q0.accept(el0); @@ -321,7 +321,7 @@ public class TestQueryCache extends BaseTestCase { q1.accept(el1); el1.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); // different queries } diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index d351a693b..bf23b590f 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheRegion; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ public class PersonCacheTests { addTestData(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(PersonCacheInfo.class) .select("personId") // do not fetch name @@ -70,7 +70,7 @@ public class PersonCacheTests { assertThat(email.getPersonInfo().getName()).isNotNull(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); @@ -91,7 +91,7 @@ public class PersonCacheTests { assertThat(email.getPersonInfo().getName()).isNotNull(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 8cf1bafee..35aad8927 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,10 +45,10 @@ public class TestMultiCascadeBatch extends BaseTestCase { grandparent.setChildren(Collections.singletonList(parent)); parent.setChildren(Collections.singletonList(child)); - LoggedSqlCollector.start(); + LoggedSql.start(); grandparent.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); final List list = DB.find(Site.class).where() .idIn(grandparent.getId(), parent.getId(), child.getId()) diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java index 5757b10e2..f567928e3 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Collections; @@ -22,10 +22,10 @@ public class TestOrderedList extends BaseTestCase { details.add(new OmOrderedDetail("d"+i)); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql.size()).isGreaterThan(1); assertSql(sql.get(0)).contains("insert into om_ordered_master"); boolean hasId = sql.get(1).contains(" (id, name"); @@ -38,14 +38,14 @@ public class TestOrderedList extends BaseTestCase { // update without any changes DB.save(master); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // update just changing master master.setName("m1-mod"); DB.save(master); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); 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(); List details1 = fresh.getDetails(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertSql(sql.get(0)).contains("order by t0.id, t1.sort_order"); // fetched, not dirty DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); @@ -76,7 +76,7 @@ public class TestOrderedList extends BaseTestCase { DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(7); 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=?"); @@ -85,7 +85,7 @@ public class TestOrderedList extends BaseTestCase { fresh.setName("m1-mod3"); DB.save(fresh); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); 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(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); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?"); assertSqlBind(sql.get(1)); diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index e2c8ff81f..43ccfd776 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -66,11 +66,11 @@ public class TestPrivateOwned extends BaseTestCase { DB.save(m0); assertThat(m0.getDetails()).hasSize(2); - LoggedSqlCollector.start(); + LoggedSql.start(); m0.getDetails().remove(0); DB.save(m0); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?"); assertSqlBind(loggedSql.get(1)); @@ -78,9 +78,9 @@ public class TestPrivateOwned extends BaseTestCase { TSMaster masterReload = DB.find(TSMaster.class, m0.getId()); assertThat(masterReload.getDetails()).hasSize(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(m0); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(0); } diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java index b67ad2a14..02b03ad73 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java @@ -9,7 +9,7 @@ import io.ebean.annotation.ChangeLog; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPersistRequest; 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.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java index 791bfef69..8986ba8e8 100644 --- a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -75,10 +75,10 @@ public class TestForeignKeyModes extends BaseTestCase { assertThat(found.getOnes()).isNotNull(); assertThat(found.getOnes()).hasSize(0); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(none); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 = ?"); assertSqlBind(sql.get(1)); @@ -118,10 +118,10 @@ public class TestForeignKeyModes extends BaseTestCase { DB.save(one); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(one); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("delete from dfk_cascade_one where id=?"); diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java index 0d33d5e74..828fc2b35 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -2,7 +2,7 @@ package org.tests.defaultvalues; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,9 +21,9 @@ public class TestDefaults extends BaseTestCase { main.getRelatedModels().add(ref); } - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(main); - final List current = LoggedSqlCollector.current(); + final List current = LoggedSql.collect(); assertThat(current).isNotEmpty(); if (isMySql() || isMariaDB()) { diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index 2f114063e..c1bd19cbb 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -7,7 +7,7 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmarkUser; import org.tests.model.basic.Contact; @@ -34,7 +34,7 @@ public class TestDeleteByQuery extends BaseTestCase { createUser("deleteWithLimit3"); createUser("deleteWithLimit4"); - LoggedSqlCollector.start(); + LoggedSql.start(); final int rows = DB.find(BBookmarkUser.class) .where().startsWith("name", "deleteWithLimit") .setMaxRows(3) @@ -42,7 +42,7 @@ public class TestDeleteByQuery extends BaseTestCase { assertThat(rows).isEqualTo(3); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 "); } else { @@ -74,20 +74,20 @@ public class TestDeleteByQuery extends BaseTestCase { .where().eq("org.name", "NahYeahMaybe") .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.delete(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); 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"); Query query2 = server.find(BBookmarkUser.class) .where().eq("name", "NotARealFirstName").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query2.delete(); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isPlatformSupportsDeleteTableAlias()) { assertThat(loggedSql.get(0)).contains("delete from bbookmark_user t0 where t0.name ="); @@ -114,19 +114,19 @@ public class TestDeleteByQuery extends BaseTestCase { Query query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.delete(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); 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 = ?"); Query query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query2.delete(); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); 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 public void queryByIdDelete() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(BBookmarkUser.class).where().eq("id", 7000).delete(); DB.find(BBookmarkUser.class).setId(7000).delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPlatformSupportsDeleteTableAlias()) { 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 = ?"); @@ -162,12 +162,12 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void queryByIdDelete_withEscalation() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Contact.class).where().eq("id", 7000).delete(); DB.find(Contact.class).setId(7000).delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // 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(1)).contains("select t0.id from contact t0 where t0.id = ?"); @@ -179,7 +179,7 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void queryDelete_withTransactionNoCascade() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setPersistCascade(false); @@ -189,7 +189,7 @@ public class TestDeleteByQuery extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPlatformSupportsDeleteTableAlias()) { assertSql(sql.get(0)).contains("delete from contact t0 where t0.id = ?"); } else if (!isMySql()){ @@ -200,14 +200,14 @@ public class TestDeleteByQuery extends BaseTestCase { @Test public void testWithForUpdate() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .where().eq("name", "Don Roberto") .query().forUpdate() .delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { assertSql(sql.get(0)).contains("select t0.id from o_customer t0 with (updlock) where t0.name = ?"); diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index 787de2bd9..1b24ee419 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -2,7 +2,7 @@ package org.tests.delete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -23,10 +23,10 @@ public class TestDeleteCascadeWithListener extends BaseTestCase { DcMaster found = DB.find(DcMaster.class, m0.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?"); diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index 2d78a94b3..fd6f0f0f3 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; @@ -34,12 +34,12 @@ public class DocLinkTest extends BaseTestCase { assertThat(link).isNotNull(); - LoggedSqlCollector.start(); + LoggedSql.start(); // no lazy loading is invoked as draft property considered @Transient assertThat(link.isDraft()).isFalse(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).isEmpty(); } diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index c5d3f5560..f3e26c876 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -8,7 +8,7 @@ import io.ebean.Transaction; import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 587d935d2..228e3ed47 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.AnimalShelter; @@ -61,12 +61,12 @@ public class TestInheritanceOnMany extends BaseTestCase { dog.setRegistrationNumber("D2"); DB.save(dog); - LoggedSqlCollector.start(); + LoggedSql.start(); // Dog is concrete so we return as Dog even though // it could be a BigDog (so we are trusting the caller) Dog ref = DB.reference(Dog.class, dog.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertNotNull(ref); @@ -82,10 +82,10 @@ public class TestInheritanceOnMany extends BaseTestCase { bd.setRegistrationNumber("BG2"); DB.save(bd); - LoggedSqlCollector.start(); + LoggedSql.start(); BigDog bigDog = DB.reference(BigDog.class, bd.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertNotNull(bigDog); @@ -93,11 +93,11 @@ public class TestInheritanceOnMany extends BaseTestCase { assertEquals("BG2", bigDog.getRegistrationNumber()); - LoggedSqlCollector.start(); + LoggedSql.start(); // Animal is abstract so we hit the DB Animal animal = DB.reference(Animal.class, bd.getId()); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertThat(trimSql(sql.get(0), 2)).contains("select t0.species, t0.id from animal t0 where t0.id = ?"); assertNotNull(animal); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index 12adeea1a..e6d7d7dc9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -2,8 +2,8 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; @@ -30,9 +30,9 @@ public class TestInheritanceOrderColumn extends BaseTestCase { master.getReferenced().add(orderedA); master.getReferenced().add(orderedB); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); // Some platforms insert ids and others don't need to... assertSql(trimId(sql, 1)) @@ -53,7 +53,7 @@ public class TestInheritanceOrderColumn extends BaseTestCase { LoggedSql.start(); DB.save(result); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index 6d566ab24..dec3ecb53 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; @@ -27,7 +27,7 @@ public class TestInheritanceQuery extends BaseTestCase { server().save(b2); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Parent.class); @@ -46,7 +46,7 @@ public class TestInheritanceQuery extends BaseTestCase { query2 = DB.find(Parent.class).setInheritType(ChildB.class); assertThat(query2.findList()).contains(b1, b2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(1)).contains("where t0.type = 'A'"); assertSql(sql.get(2)).contains("where t0.type = 'B'"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 8774b3fef..33e1afe81 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import static org.junit.jupiter.api.Assertions.assertEquals; 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.ChildB; import org.tests.inherit.Parent; @@ -25,15 +25,15 @@ public class TestInheritanceRefBean extends BaseTestCase { Parent test; - LoggedSqlCollector.start(); + LoggedSql.start(); test = server().reference(ChildA.class, idA); assertTrue(test instanceof ChildA); - assertEquals(0, LoggedSqlCollector.stop().size()); + assertEquals(0, LoggedSql.stop().size()); - LoggedSqlCollector.start(); + LoggedSql.start(); test = server().reference(Parent.class, idB); assertTrue(test instanceof ChildB); - assertEquals(1, LoggedSqlCollector.stop().size()); + assertEquals(1, LoggedSql.stop().size()); } diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index 70ddcd518..40c75b695 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -74,7 +74,7 @@ public class TestInheritanceBothSides extends BaseTestCase { private void assertFetchAllSourceAs() { - LoggedSqlCollector.start(); + LoggedSql.start(); final List sourceAList = DB.find(SourceA.class) .fetch("target", "name") @@ -87,7 +87,7 @@ public class TestInheritanceBothSides extends BaseTestCase { assertThat(joinedNames).isEqualTo("|source a|target 1|source a2|target 1b"); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); 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"); } @@ -97,7 +97,7 @@ public class TestInheritanceBothSides extends BaseTestCase { */ private void assertFetchAllDoubleLazyLoading() { - LoggedSqlCollector.start(); + LoggedSql.start(); final List sources = DB.find(SourceBase.class).order("pos").findList(); for (SourceBase source : sources) { @@ -113,7 +113,7 @@ public class TestInheritanceBothSides extends BaseTestCase { } } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); 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"); diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index a306bfa65..d341db918 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -2,7 +2,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRef; @@ -33,32 +33,32 @@ public class TestInheritanceRefCache extends BaseTestCase { Integer id = ref.getId(); - LoggedSqlCollector.start(); + LoggedSql.start(); CInhRef gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root"); // fetch again - from cache (but fetch second bean from cache) - LoggedSqlCollector.start(); + LoggedSql.start(); gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); // fetch again - both from cache - LoggedSqlCollector.start(); + LoggedSql.start(); gotRef = DB.find(CInhRef.class).setId(id).findOne(); assertThat(gotRef).isInstanceOf(CInhRef.class); assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } @@ -84,11 +84,11 @@ public class TestInheritanceRefCache extends BaseTestCase { ids.add(two.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(CInhRoot.class).setUseQueryCache(true).where().idIn(ids).setMapKey("licenseNumber").findMap(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } diff --git a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java index effd778e5..b33391c5b 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -20,11 +20,11 @@ public class TestOnlyIdEntity extends BaseTestCase { final Database database = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); OnlyIdEntity bean = new OnlyIdEntity(); database.save(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(bean.getId()).isGreaterThan(0); assertThat(sql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index 405bca390..fb2af986b 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.carwheel.Car; import org.tests.model.carwheel.Tire; @@ -71,7 +71,7 @@ public class TestCarWheelIud extends BaseTestCase { DB.saveAll(asList(car0, car1, car2)); - LoggedSqlCollector.start(); + LoggedSql.start(); final PagedList pagedList = DB.find(Car.class) .select("brand, totalSold") @@ -84,7 +84,7 @@ public class TestCarWheelIud extends BaseTestCase { assertThat(list).hasSize(2); assertThat(count).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { assertSql(sql.get(0)).contains("select t0.brand, sum(t0.sold) from sa_car t0 group by t0.brand limit 10"); diff --git a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java index 0cd2bcda1..6aeaa4a37 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java @@ -2,7 +2,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,10 +21,10 @@ public class TestPersistCascade extends BaseTestCase { country.addCity(new PcfCity("city_" + ModUUID.newShortId(), mayor, viceMayor)); } - LoggedSqlCollector.start(); + LoggedSql.start(); country.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("insert into pcf_country"); diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 0a4bd2022..7fd2ee8ce 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -8,7 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson3; import org.tests.model.json.EBasicJsonList; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 7f2a6a0db..984cf4454 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.text.TextException; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; @@ -102,9 +102,9 @@ public class TestDbJson_List extends BaseTestCase { private void update_when_notDirty() { found.setName("mod"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=?, no longer included with dirty detection @@ -118,9 +118,9 @@ public class TestDbJson_List extends BaseTestCase { //found.setName("modAgain"); found.getTags().add("three"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included using MD5 dirty detection @@ -132,9 +132,9 @@ public class TestDbJson_List extends BaseTestCase { //found.setName("modAgain"); found.getFlags().remove(42L); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included with MD5 dirty detection @@ -148,9 +148,9 @@ public class TestDbJson_List extends BaseTestCase { found.getBeanList().clear(); found.getBeanMap().remove("key0"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) // plain_bean=? not included with MD5 dirty detection diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index fd10d9e99..ffbe90185 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.text.json.EJson; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.tests.model.json.EBasicJsonMap; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMapDetail; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index d3aabecd4..76baa16fa 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.DB; import io.ebean.Query; 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.BeforeEach; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public class TestLazyForeignKeys extends BaseTestCase { @Test public void testFindOne() throws Exception { // use findOne without select, so lazy loading will occur - LoggedSqlCollector.start(); + LoggedSql.start(); MainEntityRelation rel1 = DB.find(MainEntityRelation.class).findOne(); @@ -55,7 +55,7 @@ public class TestLazyForeignKeys extends BaseTestCase { assertFalse(rel1.getEntity1().isDeleted()); assertTrue(rel1.getEntity2().isDeleted()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation"); if (isSqlServer() || isOracle()) { diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index 995641642..415f56c97 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; 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.Test; import org.tests.model.basic.MnocRole; @@ -43,10 +43,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { List validRoles = loadedUser.getValidRoles(); assertThat(validRoles).hasSize(2); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(u0); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); 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=?"); @@ -71,10 +71,10 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { user.setUserName("usr1-mod"); user.setValidRoles(roles); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.update(user); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); 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 = ?"); @@ -97,7 +97,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { DB.save(u0); DB.save(u1); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -106,7 +106,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { txn.commit(); } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(8); 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 = ?"); diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index cf10919f7..cf10512cd 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java index 438281e38..5ab159089 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; @@ -44,11 +44,11 @@ public class TestMergeBasic extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(one, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // 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 = ?"); @@ -92,11 +92,11 @@ public class TestMergeBasic extends BaseTestCase { .addPath("comments") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(one, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // 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 = ?"); diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index f02a45874..655537e4b 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -6,7 +6,7 @@ import io.ebean.FetchPath; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import io.ebean.text.PathProperties; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -26,11 +26,11 @@ public class TestMergeCustomer extends BaseTestCase { MCustomer mCustomer = partial("cust1", "(id,name,version)"); mCustomer.setName("NotCust0"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(mCustomer); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); 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(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); 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=?"); @@ -90,11 +90,11 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); @@ -119,11 +119,11 @@ public class TestMergeCustomer extends BaseTestCase { .setClientGeneratedIds() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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(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 .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 = ?"); @@ -210,10 +210,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(20); } @@ -236,10 +236,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(20); } @@ -274,10 +274,10 @@ public class TestMergeCustomer extends BaseTestCase { .addPath("contacts") .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(mCustomer, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { 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 = ?"); @@ -314,10 +314,10 @@ public class TestMergeCustomer extends BaseTestCase { .setDeletePermanent() .build(); - LoggedSqlCollector.start(); + LoggedSql.start(); server().merge(cust1, options); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 = ?"); diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java index 69b442d25..4974bfae1 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -35,11 +35,11 @@ public class TestMergeM2M extends BaseTestCase { MergeOptions options = new MergeOptionsBuilder().addPath("groups").build(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.merge(m0, options); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select"); @@ -65,7 +65,7 @@ public class TestMergeM2M extends BaseTestCase { DB.merge(m1, options); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("select"); assertSql(sql.get(1)).contains("delete from mmachine_mgroup"); diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index b2b778e6a..9660d7530 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -2,7 +2,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,7 +16,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -29,7 +29,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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 = ?"); @@ -46,7 +46,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -60,7 +60,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); @@ -71,7 +71,7 @@ public class TestAggregationMany extends BaseTestCase { DOrg org = MachineUseData.load(); - LoggedSqlCollector.start(); + LoggedSql.start(); List machines = DB.find(DMachine.class) .setDisableLazyLoading(true) @@ -86,7 +86,7 @@ public class TestAggregationMany extends BaseTestCase { assertThat(machine.getMachineStats()).isEmpty(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index 3199bc005..950ba1588 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -3,7 +3,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,11 +42,11 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("totalKms", 1) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2() || isPostgres()) { @@ -136,12 +136,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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) > ?"); } @@ -156,12 +156,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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) > ?"); } @@ -176,12 +176,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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) > ?"); @@ -198,12 +198,12 @@ public class TestAggregationTopLevel extends BaseTestCase { .having().gt("sum(hours)", 2) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); List result = query.findList(); assertThat(result).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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) > ?"); @@ -226,7 +226,7 @@ public class TestAggregationTopLevel extends BaseTestCase { @Test public void groupBy_in_fetchClause_singleRowInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(DMachine.class) .select("name") @@ -238,7 +238,7 @@ public class TestAggregationTopLevel extends BaseTestCase { assertThat(result).isNotEmpty(); assertThat(result.get(0).getMachineStats().get(0).getTotalKms()).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); @@ -247,7 +247,7 @@ public class TestAggregationTopLevel extends BaseTestCase { @Test public void groupBy_in_fetchClause_multipleRowsInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(DMachine.class) .select("name") @@ -264,7 +264,7 @@ public class TestAggregationTopLevel extends BaseTestCase { assertThat(firstStat.getRate()).isNotNull(); assertThat(firstStat.getDate()).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); 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"); diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index cc4eb48ba..6b62e6255 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.HashSet; @@ -108,9 +108,9 @@ public class TestDbArray_asSet extends BaseTestCase { public void update_when_notDirty() { found.setName("jack"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // 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"); @@ -122,9 +122,9 @@ public class TestDbArray_asSet extends BaseTestCase { found.getPhoneNumbers().add("9987"); found.getUids().add(UUID.randomUUID()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update earray_set_bean set phone_numbers=?, uids=?, version=? where"); } diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index bdd88410e..0a9f7ffb7 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -7,7 +7,7 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.SQLException; @@ -142,9 +142,9 @@ public class TestDbArray_basic extends BaseTestCase { public void update_when_notDirty() { found.setName("jack"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the phone numbers (as they are not dirty) 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.getUids().add(UUID.randomUUID()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update earray_bean set phone_numbers=?, uids=?, version=? where"); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 672333318..5bfaa970d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,7 +95,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = Arrays.asList("1", "2", "3"); - LoggedSqlCollector.start(); + LoggedSql.start(); log.info("Partial (2 of 3) ..."); List list = DB.find(OCachedNatKeyBean.class) @@ -106,7 +106,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); if (isH2()) { // 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") .findList(); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(list).hasSize(3); assertThat(sql).hasSize(0); @@ -144,7 +144,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(list).hasSize(3); assertThat(sql).hasSize(1); @@ -164,7 +164,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = new ArrayList<>(Arrays.asList("1", "2")); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean.class) .where() @@ -174,7 +174,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // no SQL - all beans from cache assertThat(sql).isEmpty(); @@ -193,7 +193,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { String storeId = "abc"; List skus = new ArrayList<>(Arrays.asList("3", "4")); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean.class) .where() @@ -203,7 +203,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with 2 bind params as we got not hits on the cache diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 10861e417..3e058676b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -7,7 +7,7 @@ import io.ebean.Pairs; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -100,7 +100,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001); - LoggedSqlCollector.start(); + LoggedSql.start(); Map list = DB.find(OCachedNatKeyBean3.class) .where() @@ -112,7 +112,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("sku") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertThat(list).hasSize(1); @@ -129,7 +129,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001, 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); Map list = DB.find(OCachedNatKeyBean3.class) .where() @@ -141,7 +141,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("sku") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - miss on 1000 @@ -158,7 +158,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { setup(); - LoggedSqlCollector.start(); + LoggedSql.start(); Map map = DB.find(OCachedNatKeyBean3.class) .where() @@ -169,7 +169,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .setMapKey("code") .findMap(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // in clause with only 1 bind param - miss on 1000, 1002 @@ -190,7 +190,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { List codes = asList(1001, 1000, 1002, 1003); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -202,7 +202,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order().asc("code") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // 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 skus = asList("2", "3"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -234,7 +234,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // no SQL - all beans from cache assertThat(sql).isEmpty(); @@ -253,7 +253,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { String storeId = "abc"; List skus = asList("3", "2", "4"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -264,7 +264,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2()) { // 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("3", 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -359,7 +359,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(pairs.getEntries()).hasSize(3); @@ -392,7 +392,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .add("2", 1001) .add("3", 1000); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(OCachedNatKeyBean3.class) .where() @@ -402,7 +402,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { .order("sku desc") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(pairs.getEntries()).hasSize(3); diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 4673cbac7..0f4a902c3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index ca1c71f7d..674b060c4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -3,7 +3,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -37,12 +37,12 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { resetAllMetrics(); - LoggedSqlCollector.start(); + LoggedSql.start(); final OCachedAppDetail found1 = findDetail(app0, "detail0"); assertThat(found1).isNotNull(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(1); } @@ -67,11 +67,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { assertThat(result0).hasSize(2); assertThat(getStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); final List result1 = findListDetails(app0, "detail0", "detail1"); assertThat(result1).hasSize(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(2); } @@ -96,11 +96,11 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase { assertThat(result0).hasSize(2); assertThat(getStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); final List result1 = findListApps("detail0", app0, app1); assertThat(result1).hasSize(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected cache hit, no SQL query expected").isEmpty(); assertThat(getStats().getHitCount()).isEqualTo(2); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index 53aedd28a..ba6a16ac2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -3,7 +3,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -55,12 +55,12 @@ public class TestNatKeyUid extends BaseTestCase { assertThat(result).hasSize(2); assertThat(appStats().getHitCount()).isEqualTo(0); - LoggedSqlCollector.start(); + LoggedSql.start(); result = findMany(); assertThat(result).hasSize(2); assertThat(appStats().getHitCount()).isEqualTo(2); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).as("Expected hit cache, no sql").isEmpty(); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index be128fbbc..aec8a8e39 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -21,7 +21,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -38,23 +38,23 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { DB.save(parent); // nothing flushed yet - assertThat(LoggedSqlCollector.start()).isEmpty(); + assertThat(LoggedSql.start()).isEmpty(); txn.flush(); - List loggedSql1 = LoggedSqlCollector.start(); + List loggedSql1 = LoggedSql.start(); assertThat(loggedSql1).hasSize(4); parent.setName("MyDesk"); DB.save(parent); // nothing flushed yet - assertThat(LoggedSqlCollector.start()).isEmpty(); + assertThat(LoggedSql.start()).isEmpty(); DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql2 = LoggedSqlCollector.start(); + List loggedSql2 = LoggedSql.start(); assertThat(loggedSql2).hasSize(2); assertThat(loggedSql2.get(0)).contains(" update td_parent "); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index 5d9473b91..ba3a75ffb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -19,11 +19,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { @IgnorePlatform({Platform.SQLSERVER, Platform.HANA}) // has generated IDs public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EdParent parent = new EdParent(); parent.setName("MyComputer"); @@ -47,7 +47,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(6); assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(2)).contains("insert into td_child "); @@ -60,11 +60,11 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void test_noFlushOn_getterOfNonGeneratedProperty() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EdParent parent = new EdParent(); parent.setName("MyComputer"); @@ -90,7 +90,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { DB.commitTransaction(); // insert statements for EdExtendedParent - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(4); assertThat(loggedSql.get(0)).contains("insert into td_parent"); assertThat(loggedSql.get(2)).contains("insert into td_child "); diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index ff8996562..5f1e23178 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -19,7 +19,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { @IgnorePlatform(Platform.HANA) public void testDifferRootTypes() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction txn = DB.beginTransaction()) { txn.setBatchMode(true); @@ -47,7 +47,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { extendedParent.setChildren(children); // nothing flushed yet - List loggedSql0 = LoggedSqlCollector.start(); + List loggedSql0 = LoggedSql.start(); assertEquals(0, loggedSql0.size()); // does not causes a flush as EdExtendedParent is same root as EdParent @@ -55,14 +55,14 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { DB.save(extendedParent); // insert statements for EdParent - List loggedSql1 = LoggedSqlCollector.start(); + List loggedSql1 = LoggedSql.start(); DB.commitTransaction(); assertEquals(0, loggedSql1.size()); // insert statements for EdExtendedParent - List loggedSql2 = LoggedSqlCollector.start(); + List loggedSql2 = LoggedSql.start(); assertEquals(7, loggedSql2.size()); } diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index d27f5155c..0b0520dca 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -96,7 +96,7 @@ public class TestIdClassScalar extends BaseTestCase { */ private void insertUpdateBridgeD(BUser user, BSite site) { - LoggedSqlCollector.start(); + LoggedSql.start(); BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id); DB.save(access); @@ -112,7 +112,7 @@ public class TestIdClassScalar extends BaseTestCase { assertThat(bridge.getUserId()).isEqualTo(user.id); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); 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(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); DB.save(one); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); 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=?"); @@ -141,7 +141,7 @@ public class TestIdClassScalar extends BaseTestCase { */ private void insertUpdateBridgeE(BUser user, BSite site) { - LoggedSqlCollector.start(); + LoggedSql.start(); BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user); DB.save(access); @@ -152,7 +152,7 @@ public class TestIdClassScalar extends BaseTestCase { List list = DB.find(BSiteUserE.class).findList(); assertThat(list).isNotEmpty(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); 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=?"); @@ -175,7 +175,7 @@ public class TestIdClassScalar extends BaseTestCase { one.setAccessLevel(BAccessLevel.THREE); DB.save(one); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index f5253f69a..772d12c5b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 030898a62..81a13c894 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,7 +16,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase { final TTruckHolder holder = setup(); - LoggedSqlCollector.start(); + LoggedSql.start(); final TTruckHolder found = DB.find(TTruckHolder.class) .fetch("items") @@ -27,7 +27,7 @@ public class TestMTOInheritNoDiscriminator extends BaseTestCase { assertThat(found.getItems()).hasSize(2); assertThat(found.getItems()).extracting(TTruckHolderItem::getFoo).contains("a","b"); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isH2() || isPostgres()) { diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 8ff610d9f..57b3bf6d8 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -2,7 +2,7 @@ package org.tests.model.composite; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,7 +29,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase { client.setClientPK(new CkeClientKey(20, "susan")); client.setUser(user1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(client); @@ -38,7 +38,7 @@ public class TestCompositeKeyUserClient extends BaseTestCase { DB.save(client); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("insert into cke_client (cod_cpny, cod_client, notes, username) values (?,?,?,?)"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index 19f250680..3627b50b5 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -4,7 +4,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,11 +25,11 @@ public class EcmPersonTest extends BaseTestCase { final EcmPerson person = json.toBean(EcmPerson.class, asJson); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecm_person "); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index ac815b67b..4b027fe06 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class EcsPersonTest extends BaseTestCase { final EcsPerson person = json.toBean(EcsPerson.class, asJson); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecs_person "); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 1c49afe79..b214a3381 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -23,10 +23,10 @@ public class TestElementCollectionBasic extends BaseTestCase { person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(eventLog()).containsOnly("preInsert", "postInsert"); assertThat(sql).hasSize(4); @@ -37,7 +37,7 @@ public class TestElementCollectionBasic extends BaseTestCase { found.getPhoneNumbers().size(); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from ec_person t0 where t0.id = ?"); 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 DB.save(found); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).isEmpty(); assertThat(eventLog()).isEmpty(); } @@ -54,7 +54,7 @@ public class TestElementCollectionBasic extends BaseTestCase { public void test() { eventLog(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcPerson person = new EcPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); @@ -63,7 +63,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(eventLog()).containsExactly("preInsert", "postInsert"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ec_person"); @@ -83,7 +83,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(eventLog()).containsExactly("preInsert", "postInsert"); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcPerson.class).where() @@ -98,7 +98,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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"); @@ -113,7 +113,7 @@ public class TestElementCollectionBasic extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); 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"); @@ -122,7 +122,7 @@ public class TestElementCollectionBasic extends BaseTestCase { jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcPerson bean) { @@ -130,7 +130,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ec_person"); @@ -148,7 +148,7 @@ public class TestElementCollectionBasic extends BaseTestCase { txn.commit(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("update ec_person"); @@ -163,7 +163,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.getPhoneNumbers().add("01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(9); 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=?"); @@ -213,7 +213,7 @@ public class TestElementCollectionBasic extends BaseTestCase { DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); assertThat(eventLog()).isEmpty(); @@ -230,7 +230,7 @@ public class TestElementCollectionBasic extends BaseTestCase { txn.commit(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSqlBind(sql, 1); @@ -247,7 +247,7 @@ public class TestElementCollectionBasic extends BaseTestCase { bean.getPhoneNumbers().add("01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(9); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 550b229e5..3f1e463f1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -27,7 +27,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { one.getPhoneNumbers().size(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcPerson two = DB.find(EcPerson.class) .setId(person.getId()) @@ -36,12 +36,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase { two.setName("CacheMod"); two.getPhoneNumbers().add("027 234234"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit containing phone numbers DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSqlBind(sql, 4, 6); @@ -51,7 +51,7 @@ public class TestElementCollectionBasicCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // no change EcPerson three = DB.find(EcPerson.class) @@ -61,13 +61,13 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit three.getPhoneNumbers().add("09 6534"); DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); // cache hit } else { @@ -82,12 +82,12 @@ public class TestElementCollectionBasicCache extends BaseTestCase { assertThat(four.getName()).isEqualTo("CacheMod"); assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit DB.delete(four); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Override diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 6101352c3..366ad5570 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.HashMap; @@ -16,14 +16,14 @@ public class TestElementCollectionBasicMap extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcmPerson person = new EcmPerson("MFiona021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecm_person"); @@ -42,7 +42,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { person1.getPhoneNumbers().put("mob", "09 9876"); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = 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.get("mob")).isEqualTo("09 9876"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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"); @@ -76,7 +76,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); 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"); @@ -84,7 +84,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcmPerson bean) { @@ -92,7 +92,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecm_person"); @@ -105,7 +105,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.getPhoneNumbers().put("one", "01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -140,7 +140,7 @@ public class TestElementCollectionBasicMap extends BaseTestCase { bean.getPhoneNumbers().put("two", "01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index fd04106c1..af02d2a26 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,14 +14,14 @@ public class TestElementCollectionBasicMapAsLob extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcmcPerson person = new EcmcPerson("Lob021"); person.getPhoneNumbers().put("home", "021 1234"); person.getPhoneNumbers().put("work", "021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); 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"); } - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 4d570f80b..3d6eee18f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,7 +29,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { one.getPhoneNumbers().size(); - LoggedSqlCollector.start(); + LoggedSql.start(); EcmPerson two = DB.find(EcmPerson.class) .setId(person.getId()) @@ -38,12 +38,12 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { two.setName("CacheMod"); two.getPhoneNumbers().put("mob", "027 234234"); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit containing phone numbers DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); assertSqlBind(sql, 4, 6); @@ -53,7 +53,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // no change EcmPerson three = DB.find(EcmPerson.class) @@ -63,7 +63,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { assertThat(three.getName()).isEqualTo("CacheMod"); assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit three.getPhoneNumbers().put("oth", "09 6534"); @@ -71,7 +71,7 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase { three.getPhoneNumbers().remove("work"); DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // cache hit 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()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit DB.delete(four); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } @Override diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 4b43b702a..3f3f8342d 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -15,14 +15,14 @@ public class TestElementCollectionBasicSet extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcsPerson person = new EcsPerson("Fiona021"); person.getPhoneNumbers().add("021 1234"); person.getPhoneNumbers().add("021 4321"); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecs_person"); @@ -41,7 +41,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { person1.getPhoneNumbers().add("09 9876"); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcsPerson.class).where() @@ -56,7 +56,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { assertThat(phoneNumbers0).containsExactly("021 1234", "021 4321"); assertThat(phoneNumbers1).containsExactly("09 1234", "09 4321", "09 9876"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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"); @@ -71,7 +71,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); 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"); @@ -80,7 +80,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcsPerson bean) { @@ -88,7 +88,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.setName("Fiona021-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update ecs_person"); @@ -101,7 +101,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.getPhoneNumbers().add("01-22123"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -136,7 +136,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase { bean.getPhoneNumbers().add("01-4321"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 4569132f8..0278dd465 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class TestElementCollectionCascadeMultiple extends BaseTestCase { top.setPerson(person); top.getPeople().add(person); - LoggedSqlCollector.start(); + LoggedSql.start(); save(top); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("insert into ecs_person"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 923ba37af..1c19069c6 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -14,14 +14,14 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcblPerson person = new EcblPerson("Fiona64021"); person.getPhoneNumbers().add(new EcPhone("64", "021", "1234")); person.getPhoneNumbers().add(new EcPhone("64", "021", "4321")); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); 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")); DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = 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(phoneNumbers1.toString()).contains("61-09-1234", "64-09-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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"); @@ -69,7 +69,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { assertThat(found2).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); 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"); @@ -80,7 +80,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcblPerson bean) { @@ -88,7 +88,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.setName("Fiona64-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); 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")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -136,7 +136,7 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase { bean.getPhoneNumbers().add(new EcPhone("01", "12", "4321")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 59ec71e0d..f3ec4b24b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,11 +24,11 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { .fetch("phoneNumbers") .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); one.getPhoneNumbers().size(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); EcblPerson two = DB.find(EcblPerson.class) @@ -38,7 +38,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { two.getPhoneNumbers().size(); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit two.getPhoneNumbers().add(new EcPhone("61", "07", "11")); @@ -46,7 +46,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // update of collection only 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()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit @@ -76,7 +76,7 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(5); EcblPerson four = DB.find(EcblPerson.class) @@ -88,10 +88,10 @@ public class TestElementCollectionEmbeddedListCache extends BaseTestCase { DB.delete(four); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index 4b88410de..18912a254 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -15,14 +15,14 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); EcbmPerson person = new EcbmPerson("Fiona64021"); person.getPhoneNumbers().put("home", new EcPhone("64", "021","1234")); person.getPhoneNumbers().put("work", new EcPhone("64","021","4321")); DB.save(person); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into ecbm_person"); @@ -41,7 +41,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { DB.save(person1); - LoggedSqlCollector.current(); + LoggedSql.collect(); List found = DB.find(EcbmPerson.class).where() @@ -67,13 +67,13 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { assertThat(found2).hasSize(2); EcbmPerson foundFirst = found2.get(0); - LoggedSqlCollector.current(); + LoggedSql.collect(); jsonToFrom(foundFirst); updateBasic(foundFirst); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } private void updateBasic(EcbmPerson bean) { @@ -81,7 +81,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.setName("Fiona64-mod-0"); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(1); 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")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); updateOnlyCollection(bean); @@ -128,7 +128,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase { bean.getPhoneNumbers().put("other", new EcPhone("01", "12", "4321")); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(7); 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); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(2); 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=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 8ee32aac9..3c1802e78 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,11 +25,11 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { .fetch("phoneNumbers") .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); one.getPhoneNumbers().size(); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); EcbmPerson two = DB.find(EcbmPerson.class) @@ -39,7 +39,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { two.getPhoneNumbers().size(); assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321"); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11")); @@ -47,7 +47,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.save(two); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(5); // update of collection only 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()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).isEmpty(); // cache hit @@ -78,7 +78,7 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.save(three); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(5); EcbmPerson four = DB.find(EcbmPerson.class) @@ -90,10 +90,10 @@ public class TestElementCollectionEmbeddedMapCache extends BaseTestCase { DB.delete(four); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(2); - LoggedSqlCollector.stop(); + LoggedSql.stop(); } } diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 3daa0894f..fe1c32cb4 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -2,7 +2,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -17,10 +17,10 @@ public class TestEmbeddedAttrOverride extends BaseTestCase { PrimaryRevision bean = new PrimaryRevision(100); bean.setName("hello"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("insert into primary_revision (id, revision, name, version) values (?,?,?,?)"); } diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 4bfbe840d..02859e645 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; @@ -37,7 +37,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { DB.save(perAddr); - LoggedSqlCollector.start(); + LoggedSql.start(); EPerAddr found = DB.find(EPerAddr.class, perAddr.getId()); @@ -45,7 +45,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase { assertThat(found.getAddress().getCountry().getName()).startsWith("New"); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); if (isH2()) { diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index 10773c52e..e76cd7714 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -6,7 +6,7 @@ import io.ebean.ValuePair; import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -33,13 +33,13 @@ public class TestHistoryEmbeddedId extends BaseTestCase { assertNotNull(found); assertThat(found.getName()).isEqualTo("notTen"); - LoggedSqlCollector.start(); + LoggedSql.start(); final List> versions = DB.find(HEmbiBean.class) .setId(id) .findVersions(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(versions).hasSize(2); final Map diff = versions.get(0).getDiff(); diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index 2ccd4d03c..42a214988 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.Timestamp; @@ -40,7 +40,7 @@ public class TestHistoryOneToMany extends BaseTestCase { DB.save(one); Thread.sleep(20); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = DB.find(HiTOne.class) .fetch("twos") @@ -50,7 +50,7 @@ public class TestHistoryOneToMany extends BaseTestCase { .asOf(new Timestamp(System.currentTimeMillis())) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(list).hasSize(1); assertThat(list.get(0).getTwos()).hasSize(2); diff --git a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index c9241ab47..e84d82dc3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -2,7 +2,7 @@ package org.tests.model.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 48680f619..62e5e64a7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; /** * Tests M2M with complex where queries. diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 8a7b6702f..8d7d33e66 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -38,13 +38,13 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { assertThat(one).isNotNull(); - LoggedSqlCollector.start(); + LoggedSql.start(); OtoBChild child1 = one.getChild(); assertThat(child1).isNotNull(); assertThat(child1.getChild()).isEqualTo("c1"); - List lazyLoadSql = LoggedSqlCollector.stop(); + List lazyLoadSql = LoggedSql.stop(); assertThat(lazyLoadSql).hasSize(2); assertSql(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t0.id from oto_bmaster t0 where t0.id = ?"); assertSql(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id = ?"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index 34ecf0879..15d390821 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -16,12 +16,12 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { account.setName("AC234"); account.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.byId(account.getId()); assertNotNull(fetchedAccount); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 @@ -47,7 +47,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { user.setAccount(account); user.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.byId(account.getId()); assertNotNull(fetchedAccount); @@ -56,7 +56,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { assertEquals(user.getId(), fetchedAccount.getUser().getId()); assertEquals(user.getName(), fetchedAccount.getUser().getName()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 @@ -85,7 +85,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { user.setAccount(account); user.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); Account fetchedAccount = Account.find.query().fetch("user").setId(account.getId()).findOne(); assertNotNull(fetchedAccount); @@ -94,7 +94,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { assertEquals(user.getId(), fetchedAccount.getUser().getId()); assertEquals(user.getName(), fetchedAccount.getUser().getName()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 9d96c4ace..01b3cca80 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -30,10 +30,10 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { jack.setAddress(address2); // Fail do to uniqueness constraint - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(jack); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); @@ -44,7 +44,7 @@ public class TestOneToOneOrphanRemove extends BaseTestCase { jack.setAddress(null); DB.save(jack); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 78f35ec05..14051b5e4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -20,11 +20,11 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { OtoAone a = new OtoAone("a1", "a test"); b.setAone(a); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(b); - List update = LoggedSqlCollector.current(); + List update = LoggedSql.collect(); assertThat(update).hasSize(3); assertThat(update.get(0)).contains("insert into oto_aone"); assertSqlBind(update.get(1)); @@ -32,7 +32,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); @@ -46,11 +46,11 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { b.setAone(a); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(b); - List inserts = LoggedSqlCollector.current(); + List inserts = LoggedSql.collect(); assertThat(inserts).hasSize(3); assertThat(inserts.get(0)).contains("insert into oto_aone"); assertSqlBind(inserts.get(1)); @@ -58,7 +58,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); @@ -75,13 +75,13 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.save(b); - LoggedSqlCollector.start(); + LoggedSql.start(); OtoAone a2 = new OtoAone("a4", "a test"); b.setAone(a2); DB.save(b); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into oto_aone"); assertSqlBind(sql.get(1)); @@ -91,7 +91,7 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { DB.delete(b); - List deletes = LoggedSqlCollector.stop(); + List deletes = LoggedSql.stop(); assertThat(deletes).hasSize(2); assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 3ca354606..6662c5033 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -72,10 +72,10 @@ public class TestOneToOnePrimaryKeyJoin extends BaseTestCase { OtoPrime bean = DB.find(OtoPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_prime_extra where"); assertSql(sql.get(1)).contains("delete from oto_prime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index 770f671d4..b010f5b4b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -71,10 +71,10 @@ public class TestOneToOnePrimaryKeyJoinBidi extends BaseTestCase { OtoUBPrime bean = DB.find(OtoUBPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_ubprime_extra where"); assertSql(sql.get(1)).contains("delete from oto_ubprime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 9e80ba467..0ea4c16d1 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -94,10 +94,10 @@ public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { OtoUPrime bean = DB.find(OtoUPrime.class, found.getPid()); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from oto_uprime_extra where"); assertSql(sql.get(1)).contains("delete from oto_uprime where"); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index 77e835ffc..c4612e613 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -21,11 +21,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a1"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(Cover.class, cover.getId()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id = ?"); @@ -54,11 +54,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { cover1.setDeleted(false); - LoggedSqlCollector.start(); + LoggedSql.start(); cover1.update(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update cover set deleted=? where id=?; -- bind(false"); @@ -74,11 +74,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a1"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.getDefault().delete(Cover.class, cover.getId(), null); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id = ?"); @@ -94,11 +94,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { Cover cover = new Cover("a2"); cover.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.getDefault().deletePermanent(Cover.class, cover.getId(), null); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("delete from cover where id = ?"); } @@ -109,11 +109,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id "); @@ -128,14 +128,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAll(Cover.class, ids(beans), transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isPlatformBooleanNative()) { assertSql(sql.get(0)).contains("update cover set deleted=true where id"); @@ -150,11 +150,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -165,11 +165,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(Cover.class, ids(beans)); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -181,14 +181,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAllPermanent(Cover.class, ids(beans), transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); platformAssertIn(sql.get(0), "delete from cover where id "); } @@ -199,11 +199,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -218,11 +218,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAll(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -238,14 +238,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAll(beans, transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); @@ -261,11 +261,11 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.deleteAllPermanent(beans); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from cover where id=?"); } @@ -276,14 +276,14 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { List beans = beans(2); DB.saveAll(beans); - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { DB.getDefault().deleteAllPermanent(beans, transaction); transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from cover where id=?"); } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 9f96fa221..98c4acbe7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,14 +25,14 @@ public class TestOneToOneHardDelete extends BaseTestCase { Album found1 = Album.find.byId(album.getId()); - LoggedSqlCollector.start(); + LoggedSql.start(); // --------------------- // SOFT DELETE // --------------------- found1.delete(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); // assert we loaded the missing/unloaded foreign key assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.cover_id from album t0 where t0.id = ?"); @@ -42,14 +42,14 @@ public class TestOneToOneHardDelete extends BaseTestCase { Album found2 = Album.find.query().setId(album.getId()).setIncludeSoftDeletes().findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); // --------------------- // HARD DELETE // --------------------- found2.deletePermanent(); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(3); // assert we loaded the missing/unloaded foreign key assertThat(trimSql(sql.get(0), 1)).contains("select t0.id, t0.cover_id from album t0 where t0.id = ?"); diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index c7c63156d..d888f0c62 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -22,10 +22,10 @@ public class TestOrphanRemoveO2M extends BaseTestCase { master.getDetails().clear(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(master); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(DB.find(OrpDetail.class, "d1")).isNull(); assertThat(DB.find(OrpDetail.class, "d2")).isNull(); diff --git a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java index ecfff5430..b133061c6 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java @@ -1,7 +1,7 @@ package org.tests.model.site; import io.ebean.BaseTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -21,10 +21,10 @@ public class TestTreeModel extends BaseTestCase { grandparent.setChildren(singletonList(parent)); parent.setChildren(singletonList(child)); - LoggedSqlCollector.start(); + LoggedSql.start(); grandparent.save(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into tree_entity"); assertSql(sql.get(1)).contains("insert into tree_entity"); diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index 9505d9d50..47e2eff50 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -2,7 +2,7 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -22,7 +22,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase { account.save(); - LoggedSqlCollector.start(); + LoggedSql.start(); final OmAccountDBO found = DB.find(OmAccountDBO.class) .where().eq("name", "one") @@ -35,7 +35,7 @@ public class TestOneToManyNoMappedBy extends BaseTestCase { assertSame(found, child.getBananaRama()); } - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(1)).contains("select t0.banana_rama_id, t0.id, t0.description, t0.banana_rama_id from om_account_child_dbo t0 where"); } diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 66ec5e744..5e63429b3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -2,7 +2,7 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 3a3a158a4..0d035fbd5 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -2,7 +2,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -27,7 +27,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { initialInsert(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make m0 dirty ... but no cascade saved? m0.setFoodPreference("banana"); @@ -36,7 +36,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { DB.save(troop); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)"); @@ -54,7 +54,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(intersectionRows).isEqualTo(2L); - LoggedSqlCollector.current(); + LoggedSql.collect(); JtTroop fetchTroop = DB.find(JtTroop.class) .fetch("monkeys") .where().idEq(troop.getPid()) @@ -62,14 +62,14 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(fetchTroop.getMonkeys()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from troop t0 left join troop_monkey t1z_ on t1z_.troop_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?"); assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version"); DB.delete(troop); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from troop_monkey where troop_pid = ?"); assertSql(sql.get(1)).contains("delete from troop where pid=? and version=?"); @@ -90,10 +90,10 @@ public class TestOneToManyJoinTable extends BaseTestCase { trainer.getMonkeys().add(new JtMonkey("FBet")); trainer.getMonkeys().add(new JtMonkey("FThe")); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(trainer); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(13); @@ -123,10 +123,10 @@ public class TestOneToManyJoinTable extends BaseTestCase { assertThat(intersectionRows).isEqualTo(5); - LoggedSqlCollector.current(); + LoggedSql.collect(); DB.delete(trainer); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from trainer_monkey where trainer_tid = ?"); assertSql(sql.get(1)).contains("delete from trainer where tid=?"); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index e1cdd2ba8..eb22888d3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; import org.tests.o2m.jointable.inheritance.ClassB; @@ -30,11 +30,11 @@ public class TestOneToManyJoinTableInheritance extends BaseTestCase { classA.getMonkeys().add(m1); classB.getMonkeys().add(m2); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.saveAll(Arrays.asList(classA, classB)); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(11); assertSql(sql.get(0)).contains("insert into class_super "); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 7578f4f98..e86bd344c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -3,7 +3,7 @@ package org.tests.o2m.jointable; 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 java.util.Arrays; @@ -28,7 +28,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { initialInsert(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make m0 dirty ... but no cascade saved? m0.setFoodPreference("camera"); @@ -37,7 +37,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { DB.save(troop); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)"); @@ -55,7 +55,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertThat(intersectionRows).isEqualTo(2); - LoggedSqlCollector.current(); + LoggedSql.collect(); JtMonkeyGroup fetchTroop = DB.find(JtMonkeyGroup.class) .fetch("monkeys") .where().idEq(troop.getPid()) @@ -63,14 +63,14 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase { assertThat(fetchTroop.getMonkeys()).hasSize(2); - sql = LoggedSqlCollector.current(); + sql = LoggedSql.collect(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("from mkeygroup t0 left join mkeygroup_monkey t1z_ on t1z_.mkeygroup_pid = t0.pid left join monkey t1 on t1.mid = t1z_.monkey_mid where t0.pid = ?"); assertSql(sql.get(0)).contains("select t0.pid, t0.name, t0.version, t1.mid, t1.name, t1.food_preference, t1.version"); DB.delete(troop); - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("delete from mkeygroup_monkey where mkeygroup_pid = ?"); assertSql(sql.get(1)).contains("delete from mkeygroup where pid=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index a95572545..5621d4ce8 100644 --- a/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -2,7 +2,7 @@ package org.tests.o2o; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -24,13 +24,13 @@ public class TestOneToOneSaveWithoutChanges { OtoLevelB dbB = dbA.getB(); OtoLevelC dbC = dbB.getC(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(dbA); DB.save(dbB); DB.save(dbC); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(0); } } diff --git a/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java index 9c4e53fcb..abc70c061 100644 --- a/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -2,7 +2,7 @@ package org.tests.o2o; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.update.EPersonOnline; @@ -17,12 +17,12 @@ public class TestReferenceSave { DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); EPersonOnline bean = DB.reference(EPersonOnline.class, 1L); DB.save(bean); - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).hasSize(0); } } diff --git a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java index 5926bfbbe..e6604035d 100644 --- a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java @@ -2,7 +2,7 @@ package org.tests.order; import io.ebean.DB; import io.ebean.TransactionalTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.Comparator; @@ -97,9 +97,9 @@ public class TestOrderColumn extends TransactionalTestCase { children.get(1).getToys().get(0).setTitle("tt10"); children.get(3).getToys().get(2).setTitle("tt32"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(result); - final List sql = LoggedSqlCollector.current(); + final List sql = LoggedSql.collect(); assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update order_toy set title=?, sort_order=? where id=?"); @@ -134,9 +134,9 @@ public class TestOrderColumn extends TransactionalTestCase { child.getToys().remove(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(result); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from order_toy where id=?"); diff --git a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 4bc6e2ad3..c3c5fb7c0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -22,14 +22,14 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(3) .order().asc("id") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.id"); @@ -41,13 +41,13 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setMaxRows(10) .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -61,7 +61,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(3) @@ -69,7 +69,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .order().asc("id") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.id"); @@ -80,7 +80,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // maxRows 1 with no first rows means Ebean does not automatically // add the order by id to the query @@ -88,7 +88,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .setMaxRows(1) .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("order by t0.id"); @@ -99,7 +99,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); PagedList pagedList = DB.find(Order.class) @@ -108,7 +108,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { pagedList.getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -121,7 +121,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setFirstRow(10) @@ -130,7 +130,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); if (isH2()) { @@ -144,7 +144,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .order().asc("orderDate") @@ -152,7 +152,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.order_date"); @@ -163,7 +163,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .order().asc("orderDate") @@ -172,7 +172,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { .findPagedList() .getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("order by t0.order_date, t0.id desc"); diff --git a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java index 1b7aa0578..d1834ddc0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java index 51c5844f3..2f5a32b28 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -21,7 +21,7 @@ public class TestQueryBaseTable extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer one = DB.find(Customer.class) .setBaseTable("O_CUSTOMER") @@ -40,7 +40,7 @@ public class TestQueryBaseTable extends BaseTestCase { assertThat(one.getName()).isEqualTo(two.getName()); assertThat(three.getName()).isEqualTo("Fiona"); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("from O_CUSTOMER"); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java index a83fb6d83..e52212207 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index edc07ee04..004b58021 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; @@ -30,11 +30,11 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("orders.details"); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = query.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertTrue(!list.isEmpty()); String mainSql = sqlOf(query); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index 3babba0f6..967efb9ba 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -24,7 +24,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Customer customer = DB.find(Customer.class) .fetchLazy("orders") @@ -36,7 +36,7 @@ public class TestQueryFilterMany extends BaseTestCase { final int size = customer.getOrders().size(); assertThat(size).isGreaterThan(0); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(1)).contains("status = ?"); @@ -50,7 +50,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -60,7 +60,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); assertThat(sqlList.get(1)).contains("status = ?"); @@ -78,7 +78,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -91,7 +91,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); @@ -110,7 +110,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); final Query query = DB.find(Customer.class) .where().ieq("name", "Rob") @@ -121,7 +121,7 @@ public class TestQueryFilterMany extends BaseTestCase { final List customers = query.findList(); assertThat(customers).isNotEmpty(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("lower(t0.name) = ?"); assertThat(sqlList.get(1)).contains("status = ?"); @@ -168,7 +168,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .filterMany("orders").raw("1=0") @@ -180,7 +180,7 @@ public class TestQueryFilterMany extends BaseTestCase { assertThat(customer.getOrders()).isEmpty(); } - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and 1=0 order by t0.id"); } @@ -190,7 +190,7 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetch("orders") @@ -199,7 +199,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.findCount(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("select count(*) from o_customer"); } @@ -208,7 +208,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void test_filterMany_copy_findList() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetch("orders") @@ -217,7 +217,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.copy().findList(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(1, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status "); if (isPostgres()) { @@ -231,7 +231,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void test_filterMany_fetchQuery() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Customer.class) .fetchQuery("orders") // explicitly fetch orders separately @@ -240,7 +240,7 @@ public class TestQueryFilterMany extends BaseTestCase { query.findList(); - List sqlList = LoggedSqlCollector.stop(); + List sqlList = LoggedSql.stop(); assertEquals(2, sqlList.size()); assertThat(sqlList.get(0)).contains("from o_customer t0"); if (isPostgres()) { @@ -256,7 +256,7 @@ public class TestQueryFilterMany extends BaseTestCase { public void testDisjunction() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .filterMany("orders") @@ -265,7 +265,7 @@ public class TestQueryFilterMany extends BaseTestCase { .eq("orderDate", LocalDate.now()) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.status = ? or t1.order_date = ?) order by t0.id"); } @@ -274,13 +274,13 @@ public class TestQueryFilterMany extends BaseTestCase { public void testNestedFilterMany() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .filterMany("contacts").isNotNull("firstName") .filterMany("contacts.notes").istartsWith("title", "foo") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where t1.first_name is not null order by t0.id; --bind()"); @@ -292,14 +292,14 @@ public class TestQueryFilterMany extends BaseTestCase { public void testFilterManyUsingExpression() { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .where() .filterMany("contacts", "firstName isNotNull and email istartsWith ?", "rob") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer()) { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index f1de21cfc..0af842ade 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,13 +127,13 @@ public class TestQueryFindEach extends BaseTestCase { PersistenceContext pc = spiTxn.getPersistenceContext(); assertThat(pc.size(Customer.class)).isEqualTo(customerList.size()); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findEach(contact -> { // use customer from persistence context (otherwise would invoke lazy loading) assertNotNull(contact.getCustomer().getName()); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); } } @@ -170,7 +170,7 @@ public class TestQueryFindEach extends BaseTestCase { test_setLazyLoadBatchSize_withFetchLazy(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(OmBasicChild.class) .setLazyLoadBatchSize(100) @@ -178,13 +178,13 @@ public class TestQueryFindEach extends BaseTestCase { assertNotNull(child.getParent().getName()); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql.size()).isLessThan(50); } private void test_setLazyLoadBatchSize_withFetchLazy() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(OmBasicParent.class) .setLazyLoadBatchSize(5) @@ -194,7 +194,7 @@ public class TestQueryFindEach extends BaseTestCase { it.getChildren().size(); }); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(11); assertThat(sql.get(0)).contains(" from om_basic_parent "); for (int i = 1; i < 11; i++) { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index 2a514f985..fa884feb2 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -119,7 +119,7 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Order.class) .setLazyLoadBatchSize(10) @@ -135,7 +135,7 @@ public class TestQueryFindIterate extends BaseTestCase { }); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(3, loggedSql.size()); assertTrue(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name from o_order t0 join o_customer t1")); @@ -148,7 +148,7 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); // make sure we don't hit the L2 cache for order shipments DB.cacheManager().clear(Order.class); @@ -170,7 +170,7 @@ public class TestQueryFindIterate extends BaseTestCase { order.getShipments().size(); }); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty")); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index eea920c75..e9e4637db 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; import org.assertj.core.util.Lists; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -23,13 +23,13 @@ public class TestQueryFindNative extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); String sql = "select id,first_name from contact where id in(:ids)"; DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList(); DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); if (isH2()) { assertThat(loggedSql.get(0)).contains("(?,?,?)"); @@ -43,7 +43,7 @@ public class TestQueryFindNative extends BaseTestCase { ResetBasicData.reset(); String sql = "select n.id from contact n where n.first_name like ?"; - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCount = server() .findNative(Contact.class, sql) @@ -56,7 +56,7 @@ public class TestQueryFindNative extends BaseTestCase { .setParameter(1, "J%") .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(nativeIds).hasSize(rowCount); @@ -77,12 +77,12 @@ public class TestQueryFindNative extends BaseTestCase { .setMaxRows(100) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); int listSize = pagedList.getList().size(); int totalCount = pagedList.getTotalCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(listSize).isEqualTo(totalCount); @@ -204,7 +204,7 @@ public class TestQueryFindNative extends BaseTestCase { "from o_customer " + "order by order_column_1"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .setParameter(LocalDate.now()) @@ -214,7 +214,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1"); @@ -231,7 +231,7 @@ public class TestQueryFindNative extends BaseTestCase { "from o_customer " + "order by order_column_1"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .setParameter("date", LocalDate.now()) @@ -240,7 +240,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1"); @@ -255,14 +255,14 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetchQuery("contacts") .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(2); @@ -278,14 +278,14 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetch("contacts", "firstName, lastName") .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(2); @@ -301,7 +301,7 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) .fetchQuery("orders") @@ -309,7 +309,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(3); @@ -326,7 +326,7 @@ public class TestQueryFindNative extends BaseTestCase { String sql = "select * from o_customer"; - LoggedSqlCollector.start(); + LoggedSql.start(); List result = DB.findNative(Customer.class, sql) // with nativeSql fetch (default) are converted to fetchQuery() @@ -335,7 +335,7 @@ public class TestQueryFindNative extends BaseTestCase { .findList(); assertThat(result).isNotEmpty(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); if (isH2()) { assertThat(loggedSql).hasSize(3); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 823997ee8..580f821dc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -49,12 +49,12 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(4) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = pagedList.getList(); assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); } @@ -157,12 +157,12 @@ public class TestQueryFindPagedList extends BaseTestCase { PagedList pagedList = DB.find(Order.class).setMaxRows(4).findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = pagedList.getList(); assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); } @@ -211,7 +211,7 @@ public class TestQueryFindPagedList extends BaseTestCase { PagedList pagedList = DB.find(Order.class).setMaxRows(3).findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); // kinda not normal but just wrap in a transaction to assert // the background fetch does not occur (which explicitly creates @@ -225,7 +225,7 @@ public class TestQueryFindPagedList extends BaseTestCase { // invoke it again but cached... int totalRowCountAgain = pagedList.getTotalCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(orders.size() < totalRowCount); assertEquals(2, loggedSql.size()); @@ -253,12 +253,12 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(6) .findPagedList(); - LoggedSqlCollector.start(); + LoggedSql.start(); pagedList.getTotalCount(); pagedList.getList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select count(*) from o_order b where b.id > 0"); diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index 8b28bc9e8..255bf18d3 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -7,7 +7,7 @@ import io.ebean.Expr; import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -153,7 +153,7 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .select("name").where().rawOrEmpty("name = any(?)", asList("Rob", "Fiona", "Jack")) @@ -167,7 +167,7 @@ public class TestWhereRawClause extends BaseTestCase { .select("name").where().rawOrEmpty("name = any(?)", null) .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where t0.name = any(?);"); assertThat(sql.get(1)).contains("select t0.id, t0.name from o_customer t0; --bind()"); diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index a8508db65..f60686f3d 100644 --- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -3,8 +3,7 @@ package org.tests.query.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebeantest.LoggedSql; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; @@ -64,7 +63,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); int count = DB.find(TEventOne.class) @@ -73,7 +72,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(count).isGreaterThan(1); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(*) from tevent_one t0 where t0.name is not null"); } @@ -238,7 +237,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(sql).contains("having max(t0.version) >= ?"); - LoggedSqlCollector.start(); + LoggedSql.start(); for (TEventOne eventOne : list) { assertThat(eventOne.getStatus()).isNotNull(); @@ -250,7 +249,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(eventOne.getName()).isNull(); } - List lazyLoadSql = LoggedSqlCollector.stop(); + List lazyLoadSql = LoggedSql.stop(); assertThat(lazyLoadSql).isEmpty(); } @@ -375,7 +374,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); String maxLastName = DB.find(Contact.class) @@ -385,7 +384,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(maxLastName).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select max(t0.last_name) from contact t0"); } @@ -394,7 +393,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Long count = DB.find(Contact.class) @@ -404,7 +403,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(count).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)"); } @@ -413,7 +412,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List names = @@ -425,7 +424,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(names).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null order by t0.last_name"); } @@ -434,7 +433,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List names = @@ -446,7 +445,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(names).isNotEmpty(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select " + concat("t0.updtime",", ","t0.first_name") + " from contact t0"); } @@ -455,7 +454,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Instant instant = @@ -466,7 +465,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(instant).isNotNull(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null"); } @@ -476,7 +475,7 @@ public class TestAggregationCount extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List contacts = @@ -493,7 +492,7 @@ public class TestAggregationCount extends BaseTestCase { assertThat(lastName).contains(", "); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null order by t0.last_name; --bind()"); } diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 3bdff89b4..af7d6cdf0 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -10,7 +10,7 @@ import io.ebean.meta.QueryPlanInit; import io.ebean.meta.QueryPlanRequest; import io.ebean.meta.ServerMetrics; import io.ebean.meta.SortMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; @@ -107,14 +107,14 @@ public class TestCustomerFinder extends BaseTestCase { try { Customer.find.currentTransaction().setBatchMode(true); - LoggedSqlCollector.start(); + LoggedSql.start(); EBasic b = new EBasic("junk"); DB.save(b); - assertTrue(LoggedSqlCollector.current().isEmpty()); + assertTrue(LoggedSql.collect().isEmpty()); Customer.find.flush(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basic"); } finally { transaction.end(); diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index 52750e354..c67d875a1 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -3,7 +3,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .select("id, status, orderDate") @@ -29,7 +29,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(!orders.isEmpty()); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertTrue(loggedSql.get(0).contains("select distinct ")); assertTrue(loggedSql.get(0).contains(" from o_order t0 join o_order_detail u1 on u1.order_id = t0.id ")); diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index fbf8e8798..079b41d0f 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -2,7 +2,7 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -26,14 +26,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderIds = DB.find(Order.class) .where().eq("totalItems", 3) .findIds(); assertThat(orderIds).hasSize(2); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); } @@ -41,14 +41,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindList() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orders = DB.find(Order.class) .where().eq("totalItems", 3) .findList(); assertThat(orders).hasSize(2); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); } @@ -56,14 +56,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); int orders = DB.find(Order.class) .where().eq("totalItems", 3) .findCount(); assertThat(orders).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,"); assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,"); @@ -72,7 +72,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindCount_multiFormula() { - LoggedSqlCollector.start(); + LoggedSql.start(); int orders = DB.find(Order.class) .where() @@ -82,7 +82,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { assertThat(orders).isEqualTo(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,"); } @@ -90,7 +90,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindSingleAttributeList() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderDates = DB.find(Order.class) .select("orderDate") @@ -98,7 +98,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .findSingleAttributeList(); assertThat(orderDates).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains(" left join (select order_id, count(*) as total_items,"); assertSql(sql.get(0)).contains("select t0.order_date from o_order t0"); @@ -107,7 +107,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_OrderFindOne() { - LoggedSqlCollector.start(); + LoggedSql.start(); Order order = DB.find(Order.class) .select("totalItems") @@ -118,7 +118,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { assertThat(order.getTotalItems()).isEqualTo(3); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,"); if (isSqlServer()) { @@ -131,13 +131,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); List orderIds = DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)"); } @@ -145,7 +145,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindList() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .select("identifier") @@ -153,7 +153,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .where().eq("familyName", "foo") .findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select t0.identifier from parent_person t0 where t0.family_name = ?"); } @@ -161,13 +161,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .where().eq("totalAge", 3) .findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?)"); assertSql(sql.get(0)).contains("select count(*) from ( select t0.identifier from parent_person t0 left join (select i2.parent_identifier, count(*) as child_count"); @@ -176,14 +176,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindSingleAttributeList() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .select("address") .where().eq("totalAge", 3) .findSingleAttributeList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertEquals(1, sql.size()); assertSql(sql.get(0)).contains("select t0.address from parent_person t0 left join (select i2.parent_identifier"); assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)"); @@ -192,7 +192,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ParentPersonFindOne() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ParentPerson.class) .where().eq("totalAge", 3) @@ -200,7 +200,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase { .orderById(true) .findOne(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ? order by t0.identifier"); } @@ -208,13 +208,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ChildPersonParentFindIds() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findIds(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select t0.identifier from child_person t0 left join (select i2.parent_identifier"); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?"); @@ -223,13 +223,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase { @Test public void test_ChildPersonParentFindCount() { - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(ChildPerson.class) .where().eq("parent.totalAge", 3) .findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier"); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?"); diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 2afad5bfe..f88d014f9 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -33,7 +33,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkWithLazyLoadingOnBuiltInMany() { - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.find(Order.class); @@ -47,7 +47,7 @@ public class TestOrderByWithMany extends BaseTestCase { } // first one is the main query and others are lazy loading queries - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(loggedSql.size() > 1); String lazyLoadSql = loggedSql.get(1); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index feacd3e2e..9ea1847a1 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; @@ -52,7 +52,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { assertThat(generatedSql).contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?)"); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); // select count(*) from ( @@ -62,7 +62,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) // ); --bind(1,true,1,true) - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); String countSql = trimSql(loggedSql.get(0), 0); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index b7f38538c..1d9b592ac 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -25,10 +25,10 @@ public class TestQueryRawExpressionMany extends BaseTestCase { .where().raw("details.orderQty = ?", quantity) .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id and t1.id > 0 where t1.order_qty = ?)"); } diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 6ef74b43a..54740de23 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -20,7 +20,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); Long productId = 1L; @@ -64,7 +64,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase { // u1.product_id = ? // ); --bind(1) - List sqlLogged = LoggedSqlCollector.stop(); + List sqlLogged = LoggedSql.stop(); assertEquals(list.size(), rowCount); assertEquals(2, sqlLogged.size()); @@ -89,10 +89,10 @@ public class TestQueryRowCountWithMany extends BaseTestCase { .orderBy("cretime asc") .query(); - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - List sqlLogged = LoggedSqlCollector.stop(); + List sqlLogged = LoggedSql.stop(); assertEquals(1, sqlLogged.size()); assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id = ?)"); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 3b26ea15f..0f52d3dac 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -21,13 +21,13 @@ public class TestWhereAnnotation extends BaseTestCase { ResetBasicData.reset(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.find(Customer.class) .fetch("orders") .findList(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); @@ -42,7 +42,7 @@ public class TestWhereAnnotation extends BaseTestCase { DB.cacheManager().clearAll(); - LoggedSqlCollector.start(); + LoggedSql.start(); List customers = DB.find(Customer.class) .order().asc("id") @@ -52,7 +52,7 @@ public class TestWhereAnnotation extends BaseTestCase { assertThat(orders.size()).isGreaterThan(0); orders.get(0).getStatus(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(1)).contains("t0.order_date is not null"); diff --git a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 9f85d5563..01cc7a627 100644 --- a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -3,7 +3,7 @@ package org.tests.query.softdelete; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.TransactionalTestCase; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; @@ -25,7 +25,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase { DB.saveAll(list); DB.delete(list.get(1)); - LoggedSqlCollector.start(); + LoggedSql.start(); PagedList pagedList = DB.find(Cover.class) .where().startsWith("s3Url", "SoftDelPaged-") @@ -35,7 +35,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase { int totalRowCount = pagedList.getTotalCount(); List resultList = pagedList.getList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(resultList).hasSize(2); assertThat(totalRowCount).isEqualTo(2); diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 0312b3282..3daf1a4f5 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -8,7 +8,7 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -297,10 +297,10 @@ public class SqlQueryTests extends BaseTestCase { sqlQuery.setFirstRow(3); sqlQuery.setMaxRows(10); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { // FIXME: we should order by primary key ALWAYS (not by first column) when no @@ -325,9 +325,9 @@ public class SqlQueryTests extends BaseTestCase { SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id"); sqlQuery.setFirstRow(3); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("Select * from o_order order by id offset 3"); } @@ -341,9 +341,9 @@ public class SqlQueryTests extends BaseTestCase { SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id"); sqlQuery.setMaxRows(10); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("Select * from o_order order by id offset 0 rows fetch next 10 rows only;"); @@ -367,9 +367,9 @@ public class SqlQueryTests extends BaseTestCase { .setLabel("findList-3-10"); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findList(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("select * from o_order where o_order.id > ? order by id offset 0 rows fetch next 10 rows only;"); @@ -393,9 +393,9 @@ public class SqlQueryTests extends BaseTestCase { .setMaxRows(10) .setLabel("findEach-Max10Rows"); - LoggedSqlCollector.start(); + LoggedSql.start(); sqlQuery.findEach(bean -> bean.get("id")); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); if (isSqlServer()) { assertSql(sql.get(0)).contains("offset 0 rows fetch next 10 rows only"); diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 70e6a086d..ae8ca158e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -10,7 +10,7 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -45,9 +45,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { assertNotNull(list); // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); assertThat(query.findCount()).isEqualTo(list.size()); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select r.id, r.name from o_customer r"); assertThat(sql.get(0)).doesNotContain("order by"); } @@ -161,9 +161,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o"); assertThat(sql.get(0)).doesNotContain("order by"); } @@ -196,9 +196,9 @@ public class TestRawSqlOrmQuery extends BaseTestCase { } // check also select count(*) - LoggedSqlCollector.start(); + LoggedSql.start(); query.findCount(); - Listsql = LoggedSqlCollector.stop(); + Listsql = LoggedSql.stop(); assertThat(sql.get(0)).startsWith("select count(*) from ( select o.id, o.order_date, o.ship_date from o_order o"); assertThat(sql.get(0)).doesNotContain("order by"); } diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index dac2ee7ae..978902d6d 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql; import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -161,20 +161,20 @@ public class TestNativeSqlBasic extends BaseTestCase { List orders = DB.findNative(Order.class, nativeSql) .findList(); - LoggedSqlCollector.start(); + LoggedSql.start(); for (Order order : orders) { order.getStatus(); } - List sql = LoggedSqlCollector.current(); + List sql = LoggedSql.collect(); assertThat(sql).isEmpty(); for (Order order : orders) { order.getCustomer().getName(); } - sql = LoggedSqlCollector.stop(); + sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains(" from o_customer t0 where "); } diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 5b5f82b8c..991f66724 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -3,7 +3,7 @@ package org.tests.rawsql.nativesql; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; @@ -35,7 +35,7 @@ public class TestNativeWithEmbedded extends BaseTestCase { String sql = "select id, name, street, suburb, addr_city, addr_status, addr_jbean, jraw from eperson where id = ?"; - LoggedSqlCollector.start(); + LoggedSql.start(); Query query = DB.findNative(EPerson.class, sql); query.setParameter(person.getId()); @@ -46,7 +46,7 @@ public class TestNativeWithEmbedded extends BaseTestCase { assertThat(one.getAddress().getJbean().getName()).isEqualTo("hi"); assertThat(one.getAddress().getJraw().get("a")).isEqualTo("1"); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); } } diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 87ab6de65..66682b272 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -11,7 +11,7 @@ import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.event.readaudit.ReadAuditQueryPlan; import io.ebean.event.readaudit.ReadEvent; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -169,7 +169,7 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); - LoggedSqlCollector.start(); + LoggedSql.start(); List list = server.find(EBasicChangeLog.class) .setUseQueryCache(true) @@ -192,7 +192,7 @@ public class TestReadAudit extends BaseTestCase { System.out.println("test_findList_useL2Cache> second query " + list1.size()); assertThat(list1).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); System.out.println("test_findList_useL2Cache> sql: " + sql); //assertThat(sql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index f3ce1f658..e454438cc 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.SqlQuery; import io.ebean.SqlRow; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; @@ -36,11 +36,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { assertThat(bean.getVersion()).isEqualTo(1); assertThat(bean.getChildren().get(0).getVersion()).isEqualTo(1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); -// List loggedSql = LoggedSqlCollector.stop(); +// List loggedSql = LoggedSql.stop(); // // assertEquals(new Long(2), bean.getVersion()); // assertEquals(new Long(2), bean.getChildren().get(0).getVersion()); // Fails with 1 @@ -65,20 +65,20 @@ public class TestSoftDeleteBasic extends BaseTestCase { bean.setName("findSingleAttribute"); DB.save(bean); - LoggedSqlCollector.start(); + LoggedSql.start(); final String name0 = DB.find(EBasicSoftDelete.class) .select("name") .where().eq("name", "findSingleAttribute") .findSingleAttribute(); - List sql0 = LoggedSqlCollector.current(); + List sql0 = LoggedSql.collect(); assertThat(sql0.get(0)).contains("where t0.name = ? and t0.deleted ="); assertThat(name0).isEqualTo("findSingleAttribute"); // now soft delete the bean DB.delete(bean); - List sqlUpdate = LoggedSqlCollector.current(); + List sqlUpdate = LoggedSql.collect(); assertThat(sqlUpdate.get(0)).contains("update ebasic_sdchild set"); // use setIncludeSoftDeletes @@ -88,7 +88,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { .setIncludeSoftDeletes() .findSingleAttribute(); - List sql1 = LoggedSqlCollector.current(); + List sql1 = LoggedSql.collect(); assertThat(sql1.get(0)).doesNotContain(" and t0.deleted ="); assertThat(name1).isEqualTo("findSingleAttribute"); @@ -99,7 +99,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { .where().eq("name", "findSingleAttribute") .findSingleAttribute(); - List sql2 = LoggedSqlCollector.stop(); + List sql2 = LoggedSql.stop(); assertThat(sql2.get(0)).contains(" and t0.deleted ="); assertThat(name2).isNull(); } @@ -116,7 +116,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.save(bean); DB.delete(bean.getChildren().get(0)); - LoggedSqlCollector.start(); + LoggedSql.start(); List ids = DB.find(EBasicSDChild.class).where().eq("owner", bean).findIds(); assertThat(ids).hasSize(2); @@ -124,7 +124,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { List beans = DB.find(EBasicSDChild.class).where().eq("owner", bean).findList(); assertThat(beans).hasSize(2); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("from ebasic_sdchild t0 where t0.owner_id = ? and t0.deleted = "); @@ -336,10 +336,10 @@ public class TestSoftDeleteBasic extends BaseTestCase { // -- test .findCount() - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCountAfter = DB.find(EBasicSoftDelete.class).findCount(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).contains("where t0.deleted ="); @@ -347,11 +347,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { // -- test includeSoftDeletes().findCount() - LoggedSqlCollector.start(); + LoggedSql.start(); int rowCountFull = DB.find(EBasicSoftDelete.class).setIncludeSoftDeletes().findCount(); assertThat(rowCountFull).isGreaterThan(rowCountAfter); - loggedSql = LoggedSqlCollector.stop(); + loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(1); assertThat(loggedSql.get(0)).doesNotContain("where coalesce(t0.deleted,false)=false"); } @@ -369,11 +369,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { .setId(bean.getId()) .findOne(); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(partial); // check lazy loading isn't invoked (deleted set to true without invoking lazy loading) - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("update ebasic_sdchild set deleted="); assertThat(loggedSql.get(1)).contains("update ebasic_soft_delete set deleted=? where id=?"); @@ -392,11 +392,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.save(bean); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(bean); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); // The children without SoftDelete are left as is (so no third statement) assertThat(loggedSql).hasSize(2); @@ -426,7 +426,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { DB.delete(bean.getChildren().get(1)); - LoggedSqlCollector.start(); + LoggedSql.start(); Query query1 = DB.find(EBasicSoftDelete.class) diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index ab2f2bdbd..1fd0d7091 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -29,10 +29,10 @@ public class TestSoftDeleteManyToMany extends BaseTestCase { DB.save(user1); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.delete(user1); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); // No Delete from the relationship table assertThat(loggedSql).hasSize(1); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 9ae327ca5..1a275dc60 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { DB.save(y); } - LoggedSqlCollector.start(); + LoggedSql.start(); Finder finder = new Finder<>(ESoftDelY.class); ESoftDelY bean = finder @@ -58,7 +58,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { assertThat(bean).isNotNull(); - final List sql = LoggedSqlCollector.stop(); + final List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); if (isSqlServer() || isMySql() || isMariaDB()) { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where"); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index 81720abc0..d150d9712 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -2,7 +2,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelOneA; import org.tests.model.softdelete.ESoftDelOneB; @@ -24,13 +24,13 @@ public class TestSoftDeleteOtoCascade extends BaseTestCase { DB.save(a); - LoggedSqlCollector.start(); + LoggedSql.start(); // delete doesn't cascade to ESoftDelOneB as this is a // soft delete and ESoftDelOneB doesn't have soft delete flag DB.delete(a); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); assertSql(sql.get(0)).contains("update esoft_del_one_a set deleted=?, version=? where id=? and version=?"); diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index 616481f6c..a8d548ebe 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -2,7 +2,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EsdDetail; import org.tests.model.softdelete.EsdMaster; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 2c5978b17..6b58c8486 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyTopic; @@ -45,7 +45,7 @@ public class TestBatchModelFlush extends BaseTestCase { @Test public void multipleTopLevel_expect_singleFlush() { - LoggedSqlCollector.start(); + LoggedSql.start(); // 2 unrelated "top level" beans being persisted MnyB m0 = new MnyB("BatchMultipleTop_0"); @@ -70,7 +70,7 @@ public class TestBatchModelFlush extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // DEBUG io.ebean.SUM - txn[1001] BatchControl flush [MnyB:100 i:2, Role:101 i:2, MnyTopic:102 i:2] diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index bd0cb17d8..7f575924a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -6,7 +6,7 @@ import io.ebean.Database; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ public class TestBatchPersistCascade extends BaseTestCase { Database ebeanServer = DB.getDefault(); - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = ebeanServer.beginTransaction(); try { @@ -48,7 +48,7 @@ public class TestBatchPersistCascade extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertTrue(loggedSql.size() > 2); diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index fc173c957..d533dcdfb 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,11 +40,11 @@ public class TestBeanStateReset extends BaseTestCase { DB.beanState(b).resetForInsert(); b.getCs().clear(); - LoggedSqlCollector.start(); + LoggedSql.start(); b.setName("mod"); b.save(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into mny_b (id, name, version, when_created, when_modified, a_id) values ("); } diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index a48ec72ec..fab0b3eb3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -39,10 +39,10 @@ public class TestTransactionSkipCache extends BaseTestCase { try { transaction.setSkipCache(true); - LoggedSqlCollector.start(); + LoggedSql.start(); findUseQueryCache(); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).as("We didn't use the L2 query cache").hasSize(1); } finally { diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 8251fa024..44adc4e48 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -4,7 +4,7 @@ import io.ebean.*; import io.ebean.annotation.*; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index 3dd2da5f7..a9ce5d365 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -52,9 +52,9 @@ public class TestHstore extends BaseTestCase { EBasicHstore found = DB.find(EBasicHstore.class, bean.getId()); found.setName("modName"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); // we don't update the map as it is not dirty assertSql(sql.get(0)).contains("update ebasic_hstore set name=?, version=? where"); @@ -66,9 +66,9 @@ public class TestHstore extends BaseTestCase { found.setName("modNamePlus"); found.getMap().put("foo", "9987"); - LoggedSqlCollector.start(); + LoggedSql.start(); DB.save(found); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("update ebasic_hstore set name=?, map=?, version=? where id=? and version=?"); } diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index 94dd7a2dc..1c05bed7f 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.util.List; @@ -18,7 +18,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase { @Test public void test() { - LoggedSqlCollector.start(); + LoggedSql.start(); SqlUpdate sqlUpdate = DB.sqlUpdate("delete from o_customer where id in (:ids)"); @@ -31,7 +31,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase { sqlUpdate.execute(); assertEquals("delete from o_customer where id in (?,?)", sqlUpdate.getGeneratedSql()); - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); } diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index 73fc6d8db..13d72c689 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.meta.MetaTimedMetric; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; @@ -43,7 +43,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { @Test public void testExecute_inTransaction_withBatch() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(true); @@ -61,7 +61,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?"); assertSqlBind(sql, 1, 2); @@ -70,7 +70,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { @Test public void testExecute_inTransaction_withoutBatch() { - LoggedSqlCollector.start(); + LoggedSql.start(); try (Transaction transaction = DB.beginTransaction()) { transaction.setBatchMode(false); @@ -88,7 +88,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { transaction.commit(); } - List sql = LoggedSqlCollector.stop(); + List sql = LoggedSql.stop(); assertThat(sql).hasSize(2); assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?; -- bind(999999)"); assertSql(sql.get(1)).contains("update audit_log set description = description where id = ?; -- bind(999998)"); diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index 5cc110bae..ab60472c9 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -2,7 +2,7 @@ package org.tests.update; import io.ebean.DB; import io.ebean.TransactionalTestCase; -import io.ebeantest.LoggedSql; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index c852c335b..416e6f974 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import org.ebeantest.LoggedSqlCollector; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -33,7 +33,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.setUpdateAllLoadedProperties(true); - LoggedSqlCollector.start(); + LoggedSql.start(); basic2.setDescription("bbb-mod"); server.save(basic2, txn); @@ -44,7 +44,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.commit(); - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertEquals(2, loggedSql.size()); // all properties in the bean @@ -70,7 +70,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { assertEquals(2, beans.size()); - LoggedSqlCollector.start(); + LoggedSql.start(); Transaction txn = DB.beginTransaction(); @@ -92,7 +92,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { txn.end(); } - List loggedSql = LoggedSqlCollector.stop(); + List loggedSql = LoggedSql.stop(); assertThat(loggedSql).hasSize(2); assertThat(loggedSql.get(0)).contains("update e_basicver set name=?, other=? where id=?; -- bind("); diff --git a/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory b/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory deleted file mode 100644 index e4a925737..000000000 --- a/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory +++ /dev/null @@ -1 +0,0 @@ -io.ebeantest.CapturingLoggerFactory