diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 797c66e7d..f1eecb84e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -5,9 +5,9 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.core.bootup.BootupClasses; import org.junit.jupiter.api.Test; -import org.tests.model.array.IntEnum; -import org.tests.model.array.VarcharEnum; import org.tests.model.basic.Car; +import org.tests.model.basic.IntEnum; +import org.tests.model.basic.VarcharEnum; import javax.persistence.EnumType; import java.time.DayOfWeek; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index fcbe7b535..f7a659df3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -3,6 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.DB; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; @@ -25,7 +26,7 @@ public class ScalarTypeBooleanTest { String json = jsonContext.toJson(bean); TOne tOne = jsonContext.toBean(TOne.class, json); - assertTrue(tOne.isActive()); + Assertions.assertTrue(tOne.isActive()); assertEquals(json, "{\"id\":42,\"active\":true}"); } @@ -39,7 +40,7 @@ public class ScalarTypeBooleanTest { String json = jsonContext.toJson(bean); TOne tOne = jsonContext.toBean(TOne.class, json); - assertFalse(tOne.isActive()); + Assertions.assertFalse(tOne.isActive()); assertEquals(json, "{\"id\":42,\"active\":false}"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 80918a5a2..9eaf9b452 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -4,6 +4,7 @@ import io.ebean.DB; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.TJodaEntity; @@ -58,6 +59,6 @@ public class ScalarTypeJodaLocalTimeTest { String json = DB.json().toJson(bean); TJodaEntity bean1 = DB.json().toBean(TJodaEntity.class, json); - assertEquals(bean1.getLocalTime(), now); + Assertions.assertEquals(bean1.getLocalTime(), now); } } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java similarity index 72% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 00c9be698..ae6fe6b64 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -1,9 +1,8 @@ package io.ebeaninternal.server.type; -import io.ebean.xtest.BaseTestCase; import io.ebean.config.EncryptKey; +import io.ebeaninternal.server.deploy.BaseTest; import org.junit.jupiter.api.Test; -import org.tests.basic.encrypt.BasicEncryptKey; import java.nio.charset.StandardCharsets; import java.sql.Timestamp; @@ -11,7 +10,7 @@ import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -public class TestSimpleEncryptor extends BaseTestCase { +public class TestSimpleEncryptor extends BaseTest { @Test public void test() { @@ -35,4 +34,19 @@ public class TestSimpleEncryptor extends BaseTestCase { Timestamp t1 = Timestamp.valueOf(tsFormat); assertEquals(t, t1); } + + static class BasicEncryptKey implements EncryptKey { + + private final String key; + + public BasicEncryptKey(String key) { + this.key = key; + } + + @Override + public String getStringValue() { + return key; + } + + } } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java similarity index 96% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index 309a00604..b79851ef6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -1,15 +1,15 @@ package io.ebeaninternal.server.type; -import io.ebean.xtest.BaseTestCase; 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.xtest.MyDayOfWeek; -import io.ebean.xtest.MyEnum; -import io.ebean.xtest.MySex; import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.BaseTest; import org.junit.jupiter.api.Test; +import org.tests.model.basic.enums.MyDayOfWeek; +import org.tests.model.basic.enums.MyEnum; +import org.tests.model.basic.enums.MySex; import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -class TestTypeManager extends BaseTestCase { +class TestTypeManager extends BaseTest { @Test void testEnumWithSubclasses() throws SQLException { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/IntEnum.java b/ebean-core/src/test/java/org/tests/model/basic/IntEnum.java new file mode 100644 index 000000000..dcd112592 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/IntEnum.java @@ -0,0 +1,13 @@ +package org.tests.model.basic; + +import io.ebean.annotation.DbEnumType; +import io.ebean.annotation.DbEnumValue; + +public enum IntEnum { + ZERO, ONE, TWO; + + @DbEnumValue(storage = DbEnumType.INTEGER) + public int dbValue() { + return 100 + ordinal(); + } +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java new file mode 100644 index 000000000..311a20424 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java @@ -0,0 +1,32 @@ +package org.tests.model.basic; + +import org.joda.time.LocalTime; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class TJodaEntity { + + @Id + Integer id; + + LocalTime localTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public LocalTime getLocalTime() { + return localTime; + } + + public void setLocalTime(LocalTime localTime) { + this.localTime = localTime; + } + +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-core/src/test/java/org/tests/model/basic/TOne.java new file mode 100644 index 000000000..13ae7e7e2 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/TOne.java @@ -0,0 +1,55 @@ +package org.tests.model.basic; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * A basic entity to test simple things. + */ +@Entity +@Table(name = "t_oneb") +public class TOne { + + @Id + Integer id; + + String name; + + String description; + + boolean active; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/VarcharEnum.java b/ebean-core/src/test/java/org/tests/model/basic/VarcharEnum.java new file mode 100644 index 000000000..a1daa23ef --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/VarcharEnum.java @@ -0,0 +1,13 @@ +package org.tests.model.basic; + +import io.ebean.annotation.DbEnumType; +import io.ebean.annotation.DbEnumValue; + +public enum VarcharEnum { + ZERO, ONE, TWO; + + @DbEnumValue(storage = DbEnumType.VARCHAR, withConstraint = false) + public String dbValue() { + return "xXx" + name(); + } +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/enums/MyDayOfWeek.java b/ebean-core/src/test/java/org/tests/model/basic/enums/MyDayOfWeek.java new file mode 100644 index 000000000..64d157fd3 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/enums/MyDayOfWeek.java @@ -0,0 +1,17 @@ +package org.tests.model.basic.enums; + +import io.ebean.annotation.EnumValue; + +/** + * Enum test when DB CHAR column used with spaces. + */ +public enum MyDayOfWeek { + + @EnumValue("MONDAY ")MONDAY, + @EnumValue("TUESDAY ")TUESDAY, + @EnumValue("WEDNESDAY")WEDNESDAY, + @EnumValue("THURSDAY ")THURSDAY, + @EnumValue("FRIDAY ")FRIDAY, + @EnumValue("SATURDAY ")SATURDAY, + @EnumValue("SUNDAY ")SUNDAY +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/enums/MyEnum.java b/ebean-core/src/test/java/org/tests/model/basic/enums/MyEnum.java new file mode 100644 index 000000000..ba9a7ab6a --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/enums/MyEnum.java @@ -0,0 +1,28 @@ +package org.tests.model.basic.enums; + +import io.ebean.annotation.EnumValue; + +/** + * Enum with method overrides (and hence multiple actual classes). + */ +public enum MyEnum { + + @EnumValue("A")Aval { + @Override + public String doSomething() { + return "bar"; + } + }, + @EnumValue("B")Bval, + + @EnumValue("C")Cval { + @Override + public String doSomething() { + return "baz"; + } + }; + + public String doSomething() { + return "foo"; + } +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/enums/MySex.java b/ebean-core/src/test/java/org/tests/model/basic/enums/MySex.java new file mode 100644 index 000000000..6152e5bfb --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/enums/MySex.java @@ -0,0 +1,5 @@ +package org.tests.model.basic.enums; + +public enum MySex { + MALE, FEMALE +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Money.java b/ebean-core/src/test/java/org/tests/model/ivo/Money.java new file mode 100644 index 000000000..652d7ed6a --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/Money.java @@ -0,0 +1,143 @@ +package org.tests.model.ivo; + + +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.MathContext; +import java.util.Iterator; + +/** + * A representation of Money effectively wrapping BigDecimal. + *

+ *

+ *

+ * + * @author rbygrave + */ +public final class Money implements Comparable, Serializable { + + private static final long serialVersionUID = 1L; + + public static final Money ZERO = new Money(BigDecimal.ZERO); + + private final BigDecimal amount; + + public Money(BigDecimal amount) { + if (amount == null) { + throw new NullPointerException("amount can not be null"); + } + this.amount = amount; + } + + public Money(double val) { + this(BigDecimal.valueOf(val)); + } + + public Money(String val) { + this(new BigDecimal(val)); + } + + @Override + public String toString() { + return amount.toString(); + } + + + @Override + public int hashCode() { + return amount.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Money) { + // use BigDecimal.compareTo to handle scale differences + return amount.compareTo(((Money) obj).getAmount()) == 0; + } + return false; + } + + @Override + public int compareTo(Money o) { + return amount.compareTo(o.amount); + } + + public BigDecimal getAmount() { + return amount; + } + + public Money subtract(Money amt) { + BigDecimal b = amount.subtract(amt.amount); + return new Money(b); + } + + public Money subtract(Money amt, MathContext ctx) { + BigDecimal b = amount.subtract(amt.amount, ctx); + return new Money(b); + } + + public Money add(Money amt) { + BigDecimal b = amount.add(amt.amount); + return new Money(b); + } + + public Money add(Money amt, MathContext ctx) { + BigDecimal b = amount.add(amt.amount, ctx); + return new Money(b); + } + + public Money multiply(Money m) { + return multiply(m.amount); + } + + public Money multiply(int val) { + return multiply(BigDecimal.valueOf(val)); + } + + public Money multiply(float val) { + return multiply(BigDecimal.valueOf(val)); + } + + public Money multiply(double val) { + return multiply(BigDecimal.valueOf(val)); + } + + public Money multiply(BigDecimal m) { + BigDecimal b = amount.multiply(m); + return new Money(b); + } + + public Money divide(BigDecimal divisor) { + BigDecimal b = amount.divide(divisor); + return new Money(b); + } + + public Money divide(BigDecimal divisor, MathContext ctx) { + BigDecimal b = amount.divide(divisor, ctx); + return new Money(b); + } + + public static Money sum(Money... m) { + BigDecimal t = BigDecimal.ZERO; + for (Money money : m) { + t = t.add(money.amount); + } + return new Money(t); + } + + public static Money sum(Iterator it) { + BigDecimal t = BigDecimal.ZERO; + while (it.hasNext()) { + t = t.add(it.next().amount); + } + return new Money(t); + } + + public static Money sum(Iterator it, MathContext ctx) { + BigDecimal t = BigDecimal.ZERO; + while (it.hasNext()) { + t = t.add(it.next().amount, ctx); + } + return new Money(t); + } +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Oid.java b/ebean-core/src/test/java/org/tests/model/ivo/Oid.java new file mode 100644 index 000000000..11c2c2691 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/Oid.java @@ -0,0 +1,46 @@ +package org.tests.model.ivo; + + +public class Oid { + + private final long value; + + public Oid(long value) { + this.value = value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public long getValue() { + return value; + } + + @Override + public int hashCode() { + return (int) (value ^ (value >>> 32)); + } + + @Override + public boolean equals(Object o) { + if (o instanceof Oid) { + return ((Oid) o).value == value; + } + return false; + } + + public static Oid valueOf(String s) { + return new Oid<>(Integer.valueOf(s)); + } + + public static Oid valueOf(long i) { + return new Oid<>(i); + } + + public static Oid valueOf(Class cls, String s) { + Integer v = Integer.valueOf(s); + return new Oid<>(v); + } +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/SysTime.java b/ebean-core/src/test/java/org/tests/model/ivo/SysTime.java new file mode 100644 index 000000000..c1cb3001c --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/SysTime.java @@ -0,0 +1,15 @@ +package org.tests.model.ivo; + +public class SysTime { + + private final long millis; + + public SysTime(long millis) { + this.millis = millis; + } + + public long getMillis() { + return millis; + } + +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java new file mode 100644 index 000000000..bd3979651 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -0,0 +1,23 @@ +package org.tests.model.ivo.converter; + +import org.tests.model.ivo.Money; + +import javax.persistence.AttributeConverter; +import java.math.BigDecimal; + +/** + * Converts between Money and BigDecimal. + */ +public class MoneyTypeConverter implements AttributeConverter { + + @Override + public BigDecimal convertToDatabaseColumn(Money beanType) { + return beanType.getAmount(); + } + + @Override + public Money convertToEntityAttribute(BigDecimal scalarType) { + return new Money(scalarType); + } + +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java new file mode 100644 index 000000000..73e67e206 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java @@ -0,0 +1,28 @@ +package org.tests.model.ivo.converter; + +import io.ebean.config.ScalarTypeConverter; +import org.tests.model.ivo.Oid; + +public class OidTypeConverter implements ScalarTypeConverter,Long> { + + public static final Oid NULL_VALUE = new Oid<>(0); + + @Override + public Oid getNullValue() { + return NULL_VALUE; + } + + @Override + public Oid wrapValue(Long scalarType) { + return new Oid<>(scalarType); + } + + @Override + public Long unwrapValue(Oid beanType) { + if (NULL_VALUE.equals(beanType)) { + return null; + } + return beanType.getValue(); + } + +} diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java new file mode 100644 index 000000000..259b4b958 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java @@ -0,0 +1,27 @@ +package org.tests.model.ivo.converter; + +import io.ebean.config.ScalarTypeConverter; +import org.tests.model.ivo.SysTime; + +import java.sql.Timestamp; + +public class SysTimeConverter implements ScalarTypeConverter { + + + @Override + public SysTime getNullValue() { + return null; + } + + @Override + public Timestamp unwrapValue(SysTime beanType) { + return new Timestamp(beanType.getMillis()); + } + + @Override + public SysTime wrapValue(Timestamp scalarType) { + return new SysTime(scalarType.getTime()); + } + + +} diff --git a/ebean-core/src/test/resources/application-test.properties b/ebean-core/src/test/resources/application-test.properties index 3b0bce78a..6928f7f42 100644 --- a/ebean-core/src/test/resources/application-test.properties +++ b/ebean-core/src/test/resources/application-test.properties @@ -11,3 +11,5 @@ datasource.h2other.url=jdbc:h2:mem:testCoreOther;DB_CLOSE_ON_EXIT=FALSE;NON_KEYW ebean.h2.ddl.generate=true ebean.h2.ddl.run=true ebean.h2.ddl.initSql=h2-init.sql + +ebean.jodaLocalTimeMode=normal diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-test/src/test/java/io/ebean/xtest/core/TestBinaryUUID.java similarity index 66% rename from ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java rename to ebean-test/src/test/java/io/ebean/xtest/core/TestBinaryUUID.java index abf0d9d49..a995bd925 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java +++ b/ebean-test/src/test/java/io/ebean/xtest/core/TestBinaryUUID.java @@ -1,18 +1,17 @@ -package io.ebeaninternal.server.type; +package io.ebean.xtest.core; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import java.util.List; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class TestBinaryUUID extends BaseTestCase { +public class TestBinaryUUID { @Test public void test() { @@ -31,11 +30,11 @@ public class TestBinaryUUID extends BaseTestCase { UUOne fetch0 = DB.find(UUOne.class, one0.getId()); UUOne fetch1 = DB.find(UUOne.class, one1.getId()); - assertEquals(one0.getId(), fetch0.getId()); - assertEquals(one0.getName(), fetch0.getName()); + Assertions.assertEquals(one0.getId(), fetch0.getId()); + Assertions.assertEquals(one0.getName(), fetch0.getName()); - assertEquals(one1.getId(), fetch1.getId()); - assertEquals(one1.getName(), fetch1.getName()); + Assertions.assertEquals(one1.getId(), fetch1.getId()); + Assertions.assertEquals(one1.getName(), fetch1.getName()); String sql = "select id, name from uuone"; List list = DB.sqlQuery(sql).findList(); @@ -50,8 +49,8 @@ public class TestBinaryUUID extends BaseTestCase { String asJson = DB.json().toJson(fetch0); UUOne bean = DB.json().toBean(UUOne.class, asJson); - assertEquals(fetch0.getId(), bean.getId()); - assertEquals(fetch0.getName(), bean.getName()); + Assertions.assertEquals(fetch0.getId(), bean.getId()); + Assertions.assertEquals(fetch0.getName(), bean.getName()); } } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java deleted file mode 100644 index 50863f117..000000000 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.ebeaninternal.server.core; - -import io.ebean.Database; -import io.ebean.Query; -import io.ebean.Transaction; -import io.ebeaninternal.api.SpiQuery; - -public class HelpCreateQueryRequest { - - public static OrmQueryRequest create(Database server, SpiQuery.Type type, Query query, Transaction t) { - DefaultServer defaultServer = (DefaultServer) server; - return (OrmQueryRequest)defaultServer.createQueryRequest(type, query, t); - } -} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java deleted file mode 100644 index e0ab5e746..000000000 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.ebeaninternal.server.core; - -import io.ebean.DB; -import io.ebean.Query; -import io.ebeaninternal.api.SpiQuery; - -public class OrmQueryRequestTestHelper { - - static DefaultServer defaultServer = (DefaultServer) DB.getDefault(); - - /** - * Create and return a OrmQueryRequest for the given query. - */ - public static OrmQueryRequest queryRequest(Query query) { - return (OrmQueryRequest) defaultServer.createQueryRequest(SpiQuery.Type.LIST, query, null); - } - -} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java deleted file mode 100644 index 260b5bb76..000000000 --- a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package io.ebeaninternal.server.loadcontext; - -import io.ebean.xtest.BaseTestCase; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebeaninternal.server.core.OrmQueryRequest; -import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; -import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Order; - -import static org.assertj.core.api.Assertions.assertThat; - -public class DLoadContextTest extends BaseTestCase { - - private OrmQueryRequest queryRequest(Query query) { - return OrmQueryRequestTestHelper.queryRequest(query); - } - - private Query query() { - return server().find(Order.class); - } - - @Test - public void construct_when_defaults_expect_defaultLazyBatchSizeServerDefaults() { - - OrmQueryRequest queryRequest = queryRequest(query()); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadBeanContext customer = graphContext.getBeanContext("customer"); - - assertThat(customer.batchSize).isEqualTo(10); - } - - @Test - public void construct_when_fetchQuery_expect_100_batchSize() { - - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", FetchConfig.ofQuery())); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadBeanContext customer = graphContext.getBeanContext("customer"); - - assertThat(customer.batchSize).isEqualTo(100); - } - - @Test - public void construct_when_fetchQuery_expect_100_batchSize_viaFetchQuery() { - - OrmQueryRequest queryRequest = queryRequest(query().fetchQuery("customer")); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadBeanContext customer = graphContext.getBeanContext("customer"); - - assertThat(customer.batchSize).isEqualTo(100); - } - - @Test - public void construct_when_fetchQuery50_expect_50_batchSize() { - - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", FetchConfig.ofQuery(50))); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadBeanContext customer = graphContext.getBeanContext("customer"); - - assertThat(customer.batchSize).isEqualTo(50); - } - - @Test - public void construct_when_fetchQueryFirst20Lazy5_expect_20_5_batchSize() { - - OrmQueryRequest queryRequest = queryRequest(query().fetchQuery("customer")); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadBeanContext customer = graphContext.getBeanContext("customer"); - - assertThat(customer.batchSize).isEqualTo(100); - } - - @Test - public void construct_when_fetch_expect_100_100_batchSize() { - - BeanPropertyAssocMany many = (BeanPropertyAssocMany)getBeanDescriptor(Order.class).beanProperty("details"); - // the fetch is converted to a query join due to the maxRows - OrmQueryRequest queryRequest = queryRequest(query().fetch("details").setMaxRows(50)); - queryRequest.initTransIfRequired(); - queryRequest.endTransIfRequired(); - - DLoadContext graphContext = (DLoadContext) queryRequest.loadContext(); - DLoadManyContext details = graphContext.getManyContext("details", many); - - assertThat(details.batchSize).isEqualTo(100); - } - -}