diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java similarity index 81% rename from ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java rename to ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java index 042fb1b58..4de1c2162 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -1,24 +1,12 @@ package io.ebean.text; -import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.FetchPath; -import io.ebean.Query; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; - -import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -public class PathPropertiesTests extends BaseTestCase { - - private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class); +public class PathPropertiesTests { @Test public void test_noParentheses() { @@ -196,34 +184,4 @@ public class PathPropertiesTests extends BaseTestCase { assertFalse(root.includesPath("customer", "shippingAddress")); } - @Test - public void example_withQueryAndJson() { - - ResetBasicData.reset(); - - PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))"); - - Query query = DB.find(Customer.class) - .where().lt("id", 2) - .query(); - - pathProps.apply(query); - - List list = query.findList(); - - String asJson = DB.json().toJson(list, pathProps); - log.info("Json: {}", asJson); - } - - @Test - public void test_withAllPropsQuery() { - PathProperties root = PathProperties.parse("*,billingAddress(line1)"); - LoggedSql.start(); - Query query = DB.find(Customer.class).apply(root); - query.findList(); - List sql = LoggedSql.stop(); - assertThat(sql).hasSize(1); - assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;"); - } - } diff --git a/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java rename to ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java index b117d47ae..2d240eabc 100644 --- a/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java +++ b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java @@ -1,5 +1,6 @@ package io.ebean.config; +import io.ebean.config.UnderscoreNamingConvention; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 72% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 5569064ba..4be838b39 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java @@ -1,8 +1,5 @@ package io.ebean.config.dbplatform; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.MatchingNamingConvention; @@ -12,45 +9,9 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DatabasePlatformTest extends BaseTestCase { - - @Test - @ForPlatform(Platform.H2) - public void h2_platform() { - final Platform platform = DB.getDefault().platform(); - assertThat(platform).isSameAs(Platform.H2); - } - - @Test - @ForPlatform(Platform.POSTGRES) - public void postgres_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.POSTGRES); - } - - @Test - @ForPlatform(Platform.MYSQL) - public void mysql_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.MYSQL); - } - - @Test - @ForPlatform(Platform.MARIADB) - public void mariadb_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.MARIADB); - } - - @Test - @ForPlatform(Platform.SQLSERVER) - public void sqlserver_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.SQLSERVER); - } +class DatabasePlatformTest { @Test public void convertQuotedIdentifiers_when_allQuotedIdentifier_sqlServer() { diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 87% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index f53b5baf0..012c7321e 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java @@ -1,5 +1,9 @@ package io.ebean.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformTypeLookup; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.ExtraDbTypes; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.sql.Types; @@ -13,7 +17,7 @@ public class DbPlatformTypeLookupTest { @Test public void byName() throws Exception { - assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL); + Assertions.assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL); assertEquals(lookup.byName("Decimal"), DbType.DECIMAL); assertEquals(lookup.byName("decimal"), DbType.DECIMAL); diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java index 44f85c2ac..4bbc46ef1 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java @@ -1,5 +1,7 @@ package io.ebean.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeParser; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java index 450749f96..fe0c2f296 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java @@ -1,6 +1,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java index 47d8fa0dd..72f44aa5d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java @@ -1,6 +1,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.oracle.Oracle11Platform; import io.ebean.config.dbplatform.oracle.Oracle12Platform; import io.ebean.config.dbplatform.oracle.OraclePlatform; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index b7b6d524f..5ab6a479d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java @@ -2,6 +2,8 @@ package io.ebean.config.dbplatform; import io.ebean.Query; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java rename to ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java diff --git a/ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 100% rename from ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java rename to ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java diff --git a/ebean-test/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/BaseTestCase.java index 43ba79427..139e49e26 100644 --- a/ebean-test/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-test/src/test/java/io/ebean/BaseTestCase.java @@ -7,6 +7,7 @@ import io.ebean.config.dbplatform.IdType; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.util.StringHelper; +import io.ebean.xtest.base.PlatformCondition; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java deleted file mode 100644 index 128103dfb..000000000 --- a/ebean-test/src/test/java/io/ebean/PropertyTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.ebean; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - -public class PropertyTest { - - @Test - public void equals() throws Exception { - - assertEquals(prop("foo", true), prop("foo", true)); - } - - @Test - public void diff_basic() throws Exception { - - assertNotEquals(prop("foo", true), prop("bar", true)); - assertNotEquals(prop("foo", true), prop("foo", false)); - assertNotEquals(prop("foo", false), prop("foo", true)); - } - - @Test - public void diff_nulls() throws Exception { - - assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high")); - assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low")); - - assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high")); - assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true)); - assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low")); - assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high")); - } - - private OrderBy.Property prop(String name, boolean asc) { - return new OrderBy.Property(name, asc, null, null); - } - - private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) { - return new OrderBy.Property(name, asc, nulls, highLow); - } - -} diff --git a/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java b/ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java rename to ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java index 6b5697733..175f53bbb 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; import io.ebean.annotation.EnumValue; diff --git a/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java b/ebean-test/src/test/java/io/ebean/xtest/MyEnum.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/server/type/MyEnum.java rename to ebean-test/src/test/java/io/ebean/xtest/MyEnum.java index d72a853db..a94e6e9b0 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MyEnum.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; import io.ebean.annotation.EnumValue; diff --git a/ebean-test/src/test/java/io/ebean/server/type/MySex.java b/ebean-test/src/test/java/io/ebean/xtest/MySex.java similarity index 55% rename from ebean-test/src/test/java/io/ebean/server/type/MySex.java rename to ebean-test/src/test/java/io/ebean/xtest/MySex.java index b66ca2e82..edc9de792 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MySex.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MySex.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; public enum MySex { MALE, FEMALE diff --git a/ebean-test/src/test/java/io/ebean/ColumnTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/ColumnTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java index 041e64efa..1e7ac92b9 100644 --- a/ebean-test/src/test/java/io/ebean/ColumnTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebeaninternal.server.rawsql.SpiRawSql; diff --git a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/DtoQuery2Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java index 90a62f734..36f667956 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DtoQuery; +import io.ebean.QueryIterator; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index f850e3e0b..a54f4dd24 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.DtoQuery; +import io.ebean.ProfileLocation; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/DtoQueryTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java index f41928909..26b32bd05 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.DtoQuery; +import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java index 00f395f36..c263240f0 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.Database; +import io.ebean.DatabaseFactory; import io.ebean.config.*; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java index 3946de7dd..e48034d9c 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.Database; +import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.event.ServerConfigStartup; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java index 455871ae6..54d9fd45b 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java index d86dc382d..5bc087199 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java index 10ed5fbb9..39c9e2469 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -9,7 +13,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -public class EbeanServer_deleteTest extends BaseTestCase { +public class EbeanServer_deleteTest extends BaseTestCase { @Test public void delete() { diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index 6e538d0ec..6c5927d21 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Query; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java index 2d1e957e7..dc0ffcd32 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java index 474576b0c..f0aa638b7 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/ExtendedServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java index 9be28fa76..e285b3849 100644 --- a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/FetchConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/FetchConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java index 5c644b231..122c1b122 100644 --- a/ebean-test/src/test/java/io/ebean/FetchConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.FetchConfig; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/FetchGroupTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java index 74744391e..76925f4e3 100644 --- a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.FetchGroup; +import io.ebean.Query; import io.ebean.service.SpiFetchGroupQuery; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java b/ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java rename to ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java index 3f2c316a0..d31c65a51 100644 --- a/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebean.config.CurrentUserProvider; diff --git a/ebean-test/src/test/java/io/ebean/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/PlatformCondition.java rename to ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java index af8ce62d1..eada8ae2d 100644 --- a/ebean-test/src/test/java/io/ebean/PlatformCondition.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java new file mode 100644 index 000000000..6379be4ff --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java @@ -0,0 +1,46 @@ +package io.ebean.xtest.base; + +import io.ebean.OrderBy; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +public class PropertyTest { + + @Test + public void equals() throws Exception { + + Assertions.assertEquals(prop("foo", true), prop("foo", true)); + } + + @Test + public void diff_basic() throws Exception { + + Assertions.assertNotEquals(prop("foo", true), prop("bar", true)); + Assertions.assertNotEquals(prop("foo", true), prop("foo", false)); + Assertions.assertNotEquals(prop("foo", false), prop("foo", true)); + } + + @Test + public void diff_nulls() throws Exception { + + Assertions.assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high")); + Assertions.assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low")); + + Assertions.assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high")); + Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true)); + Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low")); + Assertions.assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high")); + } + + private OrderBy.Property prop(String name, boolean asc) { + return new OrderBy.Property(name, asc, null, null); + } + + private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) { + return new OrderBy.Property(name, asc, nulls, highLow); + } + +} diff --git a/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java similarity index 86% rename from ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java index 0c0b51522..bac0f7aaf 100644 --- a/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/StringHelperTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java index 5beeeb905..de03cbdcf 100644 --- a/ebean-test/src/test/java/io/ebean/StringHelperTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebean.util.StringHelper; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/TestDirtyProperties.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java index 3f2b0e581..1a3892a46 100644 --- a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.ValuePair; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.server.core.DefaultBeanState; diff --git a/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java index dfe3b8932..756dfdfa8 100644 --- a/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Filter; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java index 38d6cc22a..4f1f01e60 100644 --- a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/TextExpressionListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java index e6c85b6f1..d409628d6 100644 --- a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java @@ -1,6 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; import io.ebean.search.Match; import io.ebean.search.MultiMatch; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/TransactionalTestCase.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java index 4975100fa..13be5bbc7 100644 --- a/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebean/TxScopeTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/TxScopeTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java index 6d6cb5ce9..3d94f83dd 100644 --- a/ebean-test/src/test/java/io/ebean/TxScopeTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.TxScope; import io.ebean.annotation.PersistBatch; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/UpdateQueryTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java index ec8e55c30..62ee44b5b 100644 --- a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java rename to ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java index e233bc562..e4a22bed4 100644 --- a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java @@ -1,7 +1,9 @@ -package io.ebean.bean; +package io.ebean.xtest.bean; import io.ebean.BaseTestCase; import io.ebean.DB; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.AuditInfo; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java index 4e0b987f9..ca0d2bd8f 100644 --- a/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java @@ -1,5 +1,6 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; +import io.ebean.cache.TenantAwareKey; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java index 9145f46ab..9e3b9272e 100644 --- a/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java @@ -1,6 +1,8 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; import io.ebean.DB; +import io.ebean.cache.ServerCacheManager; +import io.ebean.cache.ServerCacheRegion; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java index 4601a321d..e3ee204e6 100644 --- a/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java @@ -1,5 +1,6 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; +import io.ebean.cache.ServerCacheOptions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanListTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/common/BeanListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java index fc041549e..b56d6ce95 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanList; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/common/BeanMapTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java index fc9a481cd..d931ed254 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanMap; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/common/BeanSetTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java index 7bc12bb07..17937d13b 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanSet; import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; diff --git a/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java index 183360a07..2ae4f24e2 100644 --- a/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.ContainerConfig; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java index 7ef7cc0f7..3568595b0 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java @@ -1,10 +1,15 @@ -package io.ebean.config; +package io.ebean.xtest.config; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.annotation.MutationDetection; import io.ebean.annotation.PersistBatch; +import io.ebean.config.DatabaseConfig; +import io.ebean.config.JsonConfig; +import io.ebean.config.MatchingNamingConvention; +import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.IdType; import io.ebean.datasource.DataSourceConfig; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Properties; @@ -105,8 +110,8 @@ public class DatabaseConfigTest { assertEquals(IdType.SEQUENCE, config.getIdType()); assertEquals(PersistBatch.ALL, config.getPersistBatch()); assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade()); - assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid()); - assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime()); + Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid()); + Assertions.assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime()); assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate()); assertEquals("r0,users,orgs", config.getEnabledL2Regions()); diff --git a/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java index 842395369..b08777c04 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.DbConstraintNaming; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java index 03465543b..dfbdb2291 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.DatabaseConfig; import io.ebean.migration.MigrationConfig; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java index a497e0d92..c567b7931 100644 --- a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java @@ -1,6 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.annotation.DocStoreMode; +import io.ebean.config.DocStoreConfig; +import io.ebean.config.PropertiesWrapper; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java index d832f1370..4e0bb89d4 100644 --- a/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java @@ -1,5 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.MatchingNamingConvention; +import io.ebean.config.PlatformConfig; +import io.ebean.config.TableName; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java index 37d02bbb8..1fa24400b 100644 --- a/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java @@ -1,9 +1,10 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.Transaction; import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DbIdentity; import io.ebean.config.dbplatform.IdType; import io.ebean.config.dbplatform.h2.H2Platform; diff --git a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java index 5301d0173..fdb6dbddc 100644 --- a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java @@ -1,7 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.avaje.config.Config; import io.ebean.annotation.Platform; +import io.ebean.config.PropertiesWrapper; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index 4f3449df4..bdeb926e8 100644 --- a/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -1,10 +1,11 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/TestTableName.java rename to ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java index ccf73ce03..699bd5566 100644 --- a/ebean-test/src/test/java/io/ebean/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java @@ -1,6 +1,7 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.BaseTestCase; +import io.ebean.config.TableName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java index f10469d52..018f2097f 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.BasicSqlLimitOffset; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java index 3e8da3acc..d54f380d7 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.BasicSqlAnsiLimiter; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java new file mode 100644 index 000000000..35ad4aa4f --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java @@ -0,0 +1,49 @@ +package io.ebean.xtest.config.dbplatform; + +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DatabasePlatformBaseTest extends BaseTestCase { + + @Test + @ForPlatform(Platform.H2) + public void h2_platform() { + final Platform platform = DB.getDefault().platform(); + assertThat(platform).isSameAs(Platform.H2); + } + + @Test + @ForPlatform(Platform.POSTGRES) + public void postgres_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.POSTGRES); + } + + @Test + @ForPlatform(Platform.MYSQL) + public void mysql_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.MYSQL); + } + + @Test + @ForPlatform(Platform.MARIADB) + public void mariadb_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.MARIADB); + } + + @Test + @ForPlatform(Platform.SQLSERVER) + public void sqlserver_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.SQLSERVER); + } + +} diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java index 52b23173a..d23add071 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbIdentity; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java similarity index 76% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java index 27fbaf159..a20ecbca9 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; import org.junit.jupiter.api.Test; import java.sql.Types; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java index 2053e98f6..eb59e5e2e 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java index cec87e885..880f7f216 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.hana.HanaHistorySupport; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java similarity index 91% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java index 94ff431c7..5c56b7fb8 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java @@ -1,6 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.hana.HanaPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java index 9993f5450..d3a36ba0d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.mysql.MySqlHistorySupport; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java index 6dcb81431..3e473b80f 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.postgres.PostgresHistorySupport; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java similarity index 66% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java index 295096e75..47f4f9552 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.SequenceIdGenerator; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.sql.ResultSet; @@ -20,12 +22,12 @@ public class SequenceBatchIdGeneratorTest { generator.add(asList(5L, 6L)); generator.add(asList(3L, 4L)); - assertThat(generator.nextId(null)).isEqualTo(1L); - assertThat(generator.nextId(null)).isEqualTo(2L); - assertThat(generator.nextId(null)).isEqualTo(3L); - assertThat(generator.nextId(null)).isEqualTo(4L); - assertThat(generator.nextId(null)).isEqualTo(5L); - assertThat(generator.nextId(null)).isEqualTo(6L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(1L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(2L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(3L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(4L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(5L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(6L); } private class TD extends SequenceIdGenerator { diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java index 887b19a3d..c2459470a 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java @@ -1,6 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java similarity index 67% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java index 9740f6858..82fbda0bf 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform.sqlserver; +package io.ebean.xtest.config.dbplatform.sqlserver; +import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; +import io.ebean.config.dbplatform.sqlserver.SqlServerHistorySupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index 1ca441253..eefbd9138 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -1,9 +1,10 @@ -package io.ebean.config.dbplatform.sqlserver; +package io.ebean.xtest.config.dbplatform.sqlserver; import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebean.config.dbplatform.sqlserver.SqlServerStepSequence; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java index f95f5ed91..8869c6f69 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java @@ -1,4 +1,4 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.BaseTestCase; import io.ebean.Database; @@ -6,6 +6,8 @@ import io.ebean.DatabaseFactory; import io.ebean.bean.BeanCollection; import io.ebean.common.BeanList; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanQueryRequest; import org.junit.jupiter.api.Test; import org.tests.example.ModUuidGenerator; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java index e42088df2..e584bc40b 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java @@ -1,10 +1,13 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.Transaction; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanDeleteIdRequest; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTDetail; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java index 87cab8635..b463129cd 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java @@ -1,8 +1,9 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.*; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanPostLoad; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java index d29d4a432..50f7f8ace 100644 --- a/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java @@ -1,6 +1,7 @@ -package io.ebean.event.readaudit; +package io.ebean.xtest.event.readaudit; +import io.ebean.event.readaudit.ReadAuditQueryPlan; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/json/EJsonTests.java rename to ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java index 1063e4d36..7e721333f 100644 --- a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java @@ -1,4 +1,4 @@ -package io.ebean.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java index a60b18d3f..3da9db351 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java @@ -1,9 +1,12 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonParser; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; +import io.ebean.text.json.JsonBeanReader; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java index bb1b4056d..ba9606b16 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java @@ -1,8 +1,11 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.DB; import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadBeanVisitor; +import io.ebean.text.json.JsonReadOptions; 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/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java index 4076d82a9..c3dd5ded2 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java @@ -1,6 +1,7 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import io.ebean.FetchPath; +import io.ebean.text.json.JsonWriteOptions; import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java index cb6e4a9d2..b5a136a2a 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java @@ -1,9 +1,12 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; import io.ebean.FetchPath; import io.ebean.Query; +import io.ebean.plugin.BeanDocType; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; import io.ebean.text.PathProperties; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; diff --git a/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java index 4bf5d1f0e..de9c14829 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java @@ -1,7 +1,9 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.ExpressionPath; 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/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java index d20757d55..6730bfdab 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java @@ -1,7 +1,9 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; 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/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java index 2189aaa44..cc3bec462 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java @@ -1,8 +1,10 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.SpiServer; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.VwCustomer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java new file mode 100644 index 000000000..620e9ab20 --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java @@ -0,0 +1,51 @@ +package io.ebean.xtest.text; + +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Query; +import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +class PathPropertiesTests extends BaseTestCase { + + private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class); + + @Test + void example_withQueryAndJson() { + ResetBasicData.reset(); + + PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))"); + + Query query = DB.find(Customer.class) + .where().lt("id", 2) + .query(); + + pathProps.apply(query); + + List list = query.findList(); + + String asJson = DB.json().toJson(list, pathProps); + log.info("Json: {}", asJson); + } + + @Test + void test_withAllPropsQuery() { + PathProperties root = PathProperties.parse("*,billingAddress(line1)"); + LoggedSql.start(); + Query query = DB.find(Customer.class).apply(root); + query.findList(); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;"); + } + +} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index d46c0afef..61f9bfb69 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -5,9 +5,9 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; -import io.ebean.server.type.MyDayOfWeek; -import io.ebean.server.type.MyEnum; -import io.ebean.server.type.MySex; +import io.ebean.xtest.MyDayOfWeek; +import io.ebean.xtest.MyEnum; +import io.ebean.xtest.MySex; import io.ebeaninternal.server.core.bootup.BootupClasses; import org.junit.jupiter.api.Test; import org.tests.model.ivo.Money; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index ef0717cdb..30f2239de 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; 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/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java index a552f0a92..6c99dd1a1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; 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/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java index f0989b7ac..948aaec30 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; 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/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index 01da50bbe..c3444cc00 100644 --- a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -1,7 +1,7 @@ package org.tests.basic.join; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java index 5dbfa8b6a..15866f137 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java @@ -1,7 +1,7 @@ package org.tests.basic.type; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.types.Cidr; import io.ebean.types.Inet; import org.junit.jupiter.api.Test; 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 65b7b8005..7c100ec0b 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -8,6 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.test.LoggedSql; +import io.ebean.xtest.base.DtoQuery2Test; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index d819dbe2f..d01024e27 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; 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/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index ffa0a5608..460f975cb 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -3,7 +3,7 @@ package org.tests.batchload; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index 00c3b03cb..53ba7cb1b 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -2,7 +2,7 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.MyCurrentUserProvider; +import io.ebean.xtest.base.MyCurrentUserProvider; import org.junit.jupiter.api.Test; import org.tests.model.EWhoProps; import org.tests.model.generated.User; 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 e6604035d..a6e198735 100644 --- a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java @@ -1,7 +1,7 @@ package org.tests.order; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index 4680763cf..0e7d1b334 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonEnum; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java index b52522de9..851e1c9fa 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; 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 01cc7a627..7b9a2fe10 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 @@ -2,7 +2,7 @@ package org.tests.query.softdelete; import io.ebean.DB; import io.ebean.PagedList; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; diff --git a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java index 078839f6a..2fcc07d09 100644 --- a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -2,7 +2,7 @@ package org.tests.refresh; import io.ebean.DB; import io.ebean.SqlRow; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; 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/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java index fc02c2133..7306753f0 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -1,7 +1,7 @@ package org.tests.text.csv; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.util.IOUtils; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index af2ccd4a3..cf55d67b1 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -1,7 +1,7 @@ package org.tests.text.csv; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; import io.ebean.util.IOUtils; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index d8d2912d7..b990a09a5 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -2,7 +2,7 @@ package org.tests.text.json; import io.ebean.DB; import io.ebean.Database; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; 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 d03da5ffb..36dab37d0 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties index dd5d255ff..d1b3f87e3 100644 --- a/ebean-test/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -39,7 +39,7 @@ ebean.autoReadOnlyDataSource=true #ebean.h2.idType=SEQUENCE ebean.mappingLocations=classpath:/ebean-xml-mappings -ebean.currentUserProvider=io.ebean.MyCurrentUserProvider +ebean.currentUserProvider=io.ebean.xtest.base.MyCurrentUserProvider #ebean.expressionNativeIlike=true #ebean.jsonInclude=NON_NULL