diff --git a/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index 16aeb3555..60d78fab8 100644 --- a/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java @@ -1,10 +1,7 @@ package io.ebean; -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index 28ae8c0ff..40f94df7e 100644 --- a/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -1,10 +1,7 @@ package io.ebean; -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/io/ebean/EbeanServer_deleteTest.java b/src/test/java/io/ebean/EbeanServer_deleteTest.java index 03ba59dd2..b3985c0a1 100644 --- a/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -1,10 +1,7 @@ package io.ebean; -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java index c3f357461..6d98ac47d 100644 --- a/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/src/test/java/io/ebean/EbeanServer_saveAllTest.java @@ -1,7 +1,7 @@ package io.ebean; import org.tests.model.basic.EBasicVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/src/test/java/io/ebean/TestUnsetLoadedProperties.java index 12cf0a255..07a92139d 100644 --- a/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/src/test/java/io/ebean/TestUnsetLoadedProperties.java @@ -2,7 +2,7 @@ package io.ebean; import io.ebean.bean.EntityBean; import org.tests.model.converstation.User; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/io/ebean/event/BeanFindControllerTest.java b/src/test/java/io/ebean/event/BeanFindControllerTest.java index 31753aaa0..0d21ffda1 100644 --- a/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -8,7 +8,7 @@ import io.ebean.common.BeanList; import io.ebean.config.ServerConfig; import org.tests.model.basic.EBasic; import org.tests.model.basic.ECustomId; -import org.example.ModUuidGenerator; +import org.tests.example.ModUuidGenerator; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java b/src/test/java/org/ebeantest/LoggedSqlCollector.java similarity index 98% rename from src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java rename to src/test/java/org/ebeantest/LoggedSqlCollector.java index 5b3e64a6e..9825a55b0 100644 --- a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java +++ b/src/test/java/org/ebeantest/LoggedSqlCollector.java @@ -1,4 +1,4 @@ -package org.avaje.ebeantest; +package org.ebeantest; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; diff --git a/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java index 31a28083d..fe09aa3f4 100644 --- a/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java +++ b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.autotune.service.TunedQueryInfo; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java index f34b02f4d..4a8d88ca9 100644 --- a/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java +++ b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java @@ -9,7 +9,7 @@ import io.ebean.bean.EntityBeanIntercept; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index 296957b20..48d78a6a1 100644 --- a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -8,7 +8,7 @@ import io.ebean.Update; import io.ebean.config.dbplatform.DbEncrypt; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.EBasicEncrypt; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 973f023b5..1c63217df 100644 --- a/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index a0621ad39..cece7cf85 100644 --- a/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicClobNoVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index d74cb2b55..1636ebafb 100644 --- a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.PersistBatch; import org.tests.model.basic.OCachedBean; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 58d378b97..1b91742ea 100644 --- a/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -6,7 +6,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 8a494ff0e..e446ae57b 100644 --- a/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 508ecb41e..d01d2ef78 100644 --- a/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 2d0e61aee..0a7ed8cca 100644 --- a/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiQuery; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java index 78d43e369..68a8235c0 100644 --- a/src/test/java/org/tests/cache/TestBeanCache.java +++ b/src/test/java/org/tests/cache/TestBeanCache.java @@ -3,7 +3,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.OCachedBean; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/cascade/TestPrivateOwned.java b/src/test/java/org/tests/cascade/TestPrivateOwned.java index d5c7f6f92..299ce5a91 100644 --- a/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java index 1e069b9c1..f771c8d37 100644 --- a/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -7,7 +7,7 @@ import io.ebean.Query; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/draftable/DocLinkTest.java b/src/test/java/org/tests/draftable/DocLinkTest.java index 9a1b6536e..04ade9e2b 100644 --- a/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/src/test/java/org/tests/draftable/DocLinkTest.java @@ -7,7 +7,7 @@ import io.ebean.Query; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; import org.assertj.core.api.StrictAssertions; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/org/example/ModUuidGenerator.java b/src/test/java/org/tests/example/ModUuidGenerator.java similarity index 93% rename from src/test/java/org/example/ModUuidGenerator.java rename to src/test/java/org/tests/example/ModUuidGenerator.java index dcf08ec85..e97cc5096 100644 --- a/src/test/java/org/example/ModUuidGenerator.java +++ b/src/test/java/org/tests/example/ModUuidGenerator.java @@ -1,4 +1,4 @@ -package org.example; +package org.tests.example; import io.ebean.config.IdGenerator; import org.avaje.moduuid.ModUUID; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java b/src/test/java/org/tests/inherit/ChildA.java similarity index 86% rename from src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java rename to src/test/java/org/tests/inherit/ChildA.java index fe9a467e9..9e6818415 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java +++ b/src/test/java/org/tests/inherit/ChildA.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java b/src/test/java/org/tests/inherit/ChildB.java similarity index 86% rename from src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java rename to src/test/java/org/tests/inherit/ChildB.java index 205a1b547..34a42e570 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java +++ b/src/test/java/org/tests/inherit/ChildB.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java b/src/test/java/org/tests/inherit/Data.java similarity index 92% rename from src/test/java/org/avaje/test/model/rawsql/inherit/Data.java rename to src/test/java/org/tests/inherit/Data.java index dcde322bf..19beedcc4 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java +++ b/src/test/java/org/tests/inherit/Data.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/EUncle.java b/src/test/java/org/tests/inherit/EUncle.java similarity index 94% rename from src/test/java/org/avaje/test/model/rawsql/inherit/EUncle.java rename to src/test/java/org/tests/inherit/EUncle.java index 6c2d9a4e0..f9c8960f7 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/EUncle.java +++ b/src/test/java/org/tests/inherit/EUncle.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java b/src/test/java/org/tests/inherit/Parent.java similarity index 96% rename from src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java rename to src/test/java/org/tests/inherit/Parent.java index fbc9cd5f8..8271637c1 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java +++ b/src/test/java/org/tests/inherit/Parent.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import javax.persistence.CascadeType; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java b/src/test/java/org/tests/inherit/ParentAggregate.java similarity index 80% rename from src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java rename to src/test/java/org/tests/inherit/ParentAggregate.java index 77e71e983..d01561669 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java +++ b/src/test/java/org/tests/inherit/ParentAggregate.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.rawsql.inherit; +package org.tests.inherit; import io.ebean.annotation.Sql; diff --git a/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 979f58159..520e84866 100644 --- a/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -3,10 +3,10 @@ package org.tests.inheritance; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.avaje.ebeantest.LoggedSqlCollector; -import org.avaje.test.model.rawsql.inherit.ChildA; -import org.avaje.test.model.rawsql.inherit.ChildB; -import org.avaje.test.model.rawsql.inherit.Parent; +import org.ebeantest.LoggedSqlCollector; +import org.tests.inherit.ChildA; +import org.tests.inherit.ChildB; +import org.tests.inherit.Parent; import org.junit.Test; import io.ebean.BaseTestCase; @@ -17,24 +17,24 @@ public class TestInheritanceRefBean extends BaseTestCase { public void test() { Parent a = new ChildA(42, "Bean A"); Parent b = new ChildB(43, "Bean B"); - + server().save(a); server().save(b); Long idA = a.getId(); Long idB = b.getId(); - + Parent test; - + LoggedSqlCollector.start(); test = server().getReference(ChildA.class, idA); assertTrue(test instanceof ChildA); assertEquals(0, LoggedSqlCollector.stop().size()); - + LoggedSqlCollector.start(); test = server().getReference(Parent.class, idB); assertTrue(test instanceof ChildB); assertEquals(1, LoggedSqlCollector.stop().size()); - - + + } } diff --git a/src/test/java/org/tests/json/TestDbJson_List.java b/src/test/java/org/tests/json/TestDbJson_List.java index e7417f26f..04dc55f6f 100644 --- a/src/test/java/org/tests/json/TestDbJson_List.java +++ b/src/test/java/org/tests/json/TestDbJson_List.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 572673496..ac970b2e4 100644 --- a/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -3,7 +3,7 @@ package org.tests.model.array; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.HashSet; diff --git a/src/test/java/org/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java index 867c04b06..92c4f0bdc 100644 --- a/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -3,7 +3,7 @@ package org.tests.model.array; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index f6dbb5542..fc75ddb5f 100644 --- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.PersistBatch; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index be35fb714..1f6f223a8 100644 --- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.PersistBatch; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index d2e752704..e4fcd6875 100644 --- a/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.PersistBatch; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 786fbd8aa..8d9da9bc7 100644 --- a/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/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.Ebean; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index b8567d558..257a340e3 100644 --- a/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index c4e2e1358..a541f4b5a 100644 --- a/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 2f2077ff8..8a2d76516 100644 --- a/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/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.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 7c1517be5..179a8b1bb 100644 --- a/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.PagedList; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java index 20c2b93af..5104ede47 100644 --- a/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/query/TestQueryFindIterate.java b/src/test/java/org/tests/query/TestQueryFindIterate.java index 76bc92316..6d17d5599 100644 --- a/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/org/tests/query/TestQueryFindPagedList.java b/src/test/java/org/tests/query/TestQueryFindPagedList.java index c0b55fa20..094e16df5 100644 --- a/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.PagedList; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index c5c86c3f1..82eb65935 100644 --- a/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index de2a6ebc2..7855fefcb 100644 --- a/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/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.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index 181a58a14..455e92e71 100644 --- a/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.converstation.Conversation; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 2624bd450..01acf7489 100644 --- a/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 0721a4d3c..019876280 100644 --- a/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 2fe88f48b..00ac23671 100644 --- a/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -7,9 +7,9 @@ import io.ebean.Query; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.avaje.test.model.rawsql.inherit.ChildA; -import org.avaje.test.model.rawsql.inherit.Data; -import org.avaje.test.model.rawsql.inherit.EUncle; +import org.tests.inherit.ChildA; +import org.tests.inherit.Data; +import org.tests.inherit.EUncle; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 3837246bf..7acdff642 100644 --- a/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 79d6c38d8..765cb8b52 100644 --- a/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.PagedList; import org.tests.model.onetoone.album.Cover; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 938baacb3..904816fe9 100644 --- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -6,7 +6,7 @@ import io.ebean.SqlQuery; import io.ebean.SqlRow; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index dd7d870ac..7735318db 100644 --- a/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -2,10 +2,10 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.avaje.test.model.rawsql.inherit.ChildA; -import org.avaje.test.model.rawsql.inherit.ChildB; -import org.avaje.test.model.rawsql.inherit.Data; -import org.avaje.test.model.rawsql.inherit.Parent; +import org.tests.inherit.ChildA; +import org.tests.inherit.ChildB; +import org.tests.inherit.Data; +import org.tests.inherit.Parent; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index f9cf23de5..e9079e8f4 100644 --- a/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.avaje.test.model.rawsql.inherit.ChildA; -import org.avaje.test.model.rawsql.inherit.ChildB; -import org.avaje.test.model.rawsql.inherit.Data; -import org.avaje.test.model.rawsql.inherit.EUncle; -import org.avaje.test.model.rawsql.inherit.Parent; -import org.avaje.test.model.rawsql.inherit.ParentAggregate; +import org.tests.inherit.ChildA; +import org.tests.inherit.ChildB; +import org.tests.inherit.Data; +import org.tests.inherit.EUncle; +import org.tests.inherit.Parent; +import org.tests.inherit.ParentAggregate; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/tests/readaudit/TestReadAudit.java b/src/test/java/org/tests/readaudit/TestReadAudit.java index 4f61f2bdc..22a0257d6 100644 --- a/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -13,7 +13,7 @@ import io.ebean.event.readaudit.ReadEvent; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Country; import org.tests.model.basic.EBasicChangeLog; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 82cc9b643..f3f798c78 100644 --- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -7,7 +7,7 @@ import io.ebean.SqlQuery; import io.ebean.SqlRow; import org.tests.model.softdelete.EBasicSDChild; import org.tests.model.softdelete.EBasicSoftDelete; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 0286e9e32..918445e1e 100644 --- a/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java b/src/test/java/org/tests/test/TestInheritWithMany.java similarity index 97% rename from src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java rename to src/test/java/org/tests/test/TestInheritWithMany.java index 391b13660..670080584 100644 --- a/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java +++ b/src/test/java/org/tests/test/TestInheritWithMany.java @@ -1,4 +1,4 @@ -package org.avaje.test.model.inheritmany.test; +package org.tests.test; import io.ebean.BaseTestCase; import io.ebean.Ebean; diff --git a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 581ee414c..b2d5c69ea 100644 --- a/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.PersistBatch; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/tests/transaction/TestBeanStateReset.java b/src/test/java/org/tests/transaction/TestBeanStateReset.java index 1c5470752..e7f17d5e1 100644 --- a/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/tests/types/TestHstore.java b/src/test/java/org/tests/types/TestHstore.java index 50d605f06..d276d92b0 100644 --- a/src/test/java/org/tests/types/TestHstore.java +++ b/src/test/java/org/tests/types/TestHstore.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 165135f09..daef5bf12 100644 --- a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; -import org.avaje.ebeantest.LoggedSqlCollector; +import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.ArrayList;