diff --git a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java rename to ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java similarity index 88% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java index 0cb2018aa..c2f2c91b2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.core; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -9,7 +10,7 @@ public class BasicTypeConverterTest { @Test public void toBoolean_when_1_long() throws Exception { - assertTrue(BasicTypeConverter.toBoolean(1L, "T")); + Assertions.assertTrue(BasicTypeConverter.toBoolean(1L, "T")); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java similarity index 85% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java index c78eafa93..169587916 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.core; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,7 +11,7 @@ public class DtoQueryRequestTest { @Test public void testParse() { - assertEquals("foo", DtoQueryRequest.parseColumn("foo")); + Assertions.assertEquals("foo", DtoQueryRequest.parseColumn("foo")); assertEquals("bar", DtoQueryRequest.parseColumn("zx__t0_bar")); assertEquals("BAR", DtoQueryRequest.parseColumn("ZX__T0_BAR")); assertEquals("baz", DtoQueryRequest.parseColumn("zx__t42_baz")); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java index eb501029e..89fb432f6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java @@ -4,16 +4,14 @@ import io.ebean.config.DatabaseConfig; import io.ebean.datasource.DataSourceAlert; import io.ebean.datasource.DataSourceConfig; import io.ebean.datasource.pool.ConnectionPool; - import org.junit.jupiter.api.Test; +import javax.sql.DataSource; +import java.sql.SQLException; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -import java.sql.SQLException; - -import javax.sql.DataSource; - public class InitDataSourceTest { private DatabaseConfig newConfig(String readOnlyUrl) { @@ -129,8 +127,8 @@ public class InitDataSourceTest { assertNotNull(roConfig); assertEquals("foo", roConfig.getUrl()); } - - + + @Test public void online() { DatabaseConfig config = new DatabaseConfig(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java similarity index 87% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java index c1e4d32ff..ef36b62f2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.deploy; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class DetermineAggPathTest { @Test public void path() throws Exception { - assertThat(DetermineAggPath.path("count(details)")).isEqualTo("details"); + Assertions.assertThat(DetermineAggPath.path("count(details)")).isEqualTo("details"); assertThat(DetermineAggPath.path("count(details )")).isEqualTo("details"); assertThat(DetermineAggPath.path("count(person.contacts)")).isEqualTo("person.contacts"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index aadc88109..fc8763c61 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.deploy; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,7 +15,7 @@ public class IndexDefinitionTest { @Test public void isUniqueConstraint_TRUE_when_simpleMultiColumn() { - assertTrue(new IndexDefinition(simpleCol1).isUniqueConstraint()); + Assertions.assertTrue(new IndexDefinition(simpleCol1).isUniqueConstraint()); assertTrue(new IndexDefinition(simpleCol2).isUniqueConstraint()); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java new file mode 100644 index 000000000..783981a75 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java @@ -0,0 +1,34 @@ +package io.ebeaninternal.server.deploy.generatedproperty; + +import io.ebeaninternal.server.deploy.BeanProperty; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + + +class GeneratedCounterLongTest { + + private final GeneratedCounterLong counter = new GeneratedCounterLong(); + + @Test + void when_null_expect_IllegalStateException() { + BeanProperty beanProperty = mock(BeanProperty.class); + when(beanProperty.getValue(any())).thenReturn(null); + + assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(beanProperty, null, System.currentTimeMillis())); + } + + @Test + void when_set_expect_incremented() { + BeanProperty beanProperty = mock(BeanProperty.class); + when(beanProperty.getValue(any())).thenReturn(7L); + + Object value = counter.getUpdateValue(beanProperty, null, System.currentTimeMillis()); + assertThat(value).isEqualTo(8L); + } + +} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java index bd75d835c..a3cf2a2fd 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.dto; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; @@ -34,7 +35,7 @@ public class DtoMetaBuilderTest { Map methods = getIncludedMethodsFor(D0.class); assertThat(methods).hasSize(2); - assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class); + Assertions.assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class); assertThat(DtoMetaProperty.propertyClass(methods.get("setId"))).isEqualTo(long.class); assertThat(DtoMetaProperty.propertyType(methods.get("setName"))).isEqualTo(String.class); assertThat(DtoMetaProperty.propertyType(methods.get("setId"))).isEqualTo(long.class); @@ -43,7 +44,7 @@ public class DtoMetaBuilderTest { @Test public void propertyName() { - assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name"); + Assertions.assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name"); assertThat(DtoMetaBuilder.propertyName("setId")).isEqualTo("id"); assertThat(DtoMetaBuilder.propertyName("setI")).isEqualTo("i"); assertThat(DtoMetaBuilder.propertyName("setfoo")).isEqualTo("foo"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java index cc3a3d481..d320f46c0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java @@ -1,11 +1,10 @@ package io.ebeaninternal.server.executor; +import io.ebean.config.MdcBackgroundExecutorWrapper; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.MDC; -import io.ebean.config.MdcBackgroundExecutorWrapper; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -109,18 +108,18 @@ public class DefaultBackgroundExecutorTest { es.submit(()->{ assertThat(MDC.get("hello")).isNull(); }).get(); - + MDC.put("hello", "there"); es.wrap(() -> { assertThat(MDC.get("hello")).isEqualTo("there"); }).run(); // will clear the MDC. But this should be OK - + MDC.put("hello", "there"); es.wrap(() -> { assertThat(MDC.get("hello")).isEqualTo("there"); return "Callable"; }).call(); // will clear the MDC. But this should be OK - + MDC.put("hello", "there"); CountDownLatch latch = new CountDownLatch(1); @@ -136,7 +135,7 @@ public class DefaultBackgroundExecutorTest { return "Callable"; }).get(); MDC.clear(); - + es.execute(()->{ assertThat(MDC.get("hello")).isNull(); }); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java similarity index 86% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java index 80c0ccff0..986a3c808 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.expression.platform; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class PostgresCastTest { @Test public void cast() { - assertThat(PostgresCast.cast(1)).isEqualTo("::integer"); + Assertions.assertThat(PostgresCast.cast(1)).isEqualTo("::integer"); assertThat(PostgresCast.cast(1L)).isEqualTo("::bigint"); assertThat(PostgresCast.cast(1.0D)).isEqualTo("::decimal"); assertThat(PostgresCast.cast("")).isEqualTo(""); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java similarity index 83% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java index 12f1edcd9..778379c59 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.profile; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +9,7 @@ public class UtilLocationTest { @Test public void label() { - assertThat(UtilLocation.label("foo")).isEqualTo("foo"); + Assertions.assertThat(UtilLocation.label("foo")).isEqualTo("foo"); assertThat(UtilLocation.label("ProfileLocationTest$Other.")).isEqualTo("ProfileLocationTest$Other.init"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java index 1f918c97d..14f4a1733 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,7 +20,7 @@ public class DbOrderByTrimTest { } private void test(String value, String suffix) { - assertEquals(value, DbOrderByTrim.trim(value + suffix)); + Assertions.assertEquals(value, DbOrderByTrim.trim(value + suffix)); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java index 6a03ea57f..ff4ccc332 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,7 +9,7 @@ public class SqlTreeBuilderTest { @Test public void mergeOnDistinct_equal() { - assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.id"), "t0.id"); + Assertions.assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.id"), "t0.id"); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index d6354f9a0..2bdafcbdc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -1,13 +1,12 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -public class OrmQueryDetailParserTest extends BaseTestCase { +public class OrmQueryDetailParserTest { OrmQueryDetail parse(String query) { return new OrmQueryDetailParser(query).parse(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java similarity index 70% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java index da7e95299..d01589962 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.querydefn; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,7 +9,7 @@ public class OrmUpdatePropertiesTest { @Test public void trim() { - assertEquals("ship_id", OrmUpdateProperties.trim("${}ship_id")); + Assertions.assertEquals("ship_id", OrmUpdateProperties.trim("${}ship_id")); assertEquals("(ship_id)", OrmUpdateProperties.trim("(${}ship_id)")); } } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java index b46714a99..3faddba2d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java @@ -3,6 +3,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import io.ebeaninternal.server.rawsql.SpiRawSql; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java similarity index 86% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java index 6cf39f216..08291108e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java @@ -2,14 +2,26 @@ package io.ebeaninternal.server.rawsql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRawSqlColumnParsing { + @Test + public void testDeriveProperty() { + Assertions.assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some_other")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.some_other")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.someOther")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some")).isEqualTo("some"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "someOther")).isEqualTo("someOther"); + } + @Test public void test_simple() { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java index 5e2f415c5..1d4cf2441 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; import io.ebean.SqlRow; +import io.ebeaninternal.server.rawsql.DRawSqlService; import org.junit.jupiter.api.Test; import java.sql.ResultSet; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class TestRawSqlService extends BaseTestCase { +public class TestRawSqlService { @Test public void testDistinctColumnNames() throws SQLException { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-core/src/test/java/org/tests/model/basic/Contact.java new file mode 100644 index 000000000..5c1e0cc8e --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/Contact.java @@ -0,0 +1,4 @@ +package org.tests.model.basic; + +public class Contact { +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-core/src/test/java/org/tests/model/basic/Customer.java new file mode 100644 index 000000000..0b0202301 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/Customer.java @@ -0,0 +1,4 @@ +package org.tests.model.basic; + +public class Customer { +} diff --git a/ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf b/ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf rename to ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-combined.mf b/ebean-core/src/test/resources/META-INF/test/test-combined.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-combined.mf rename to ebean-core/src/test/resources/META-INF/test/test-combined.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf b/ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf rename to ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-one.mf b/ebean-core/src/test/resources/META-INF/test/test-one.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-one.mf rename to ebean-core/src/test/resources/META-INF/test/test-one.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-some.mf b/ebean-core/src/test/resources/META-INF/test/test-some.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-some.mf rename to ebean-core/src/test/resources/META-INF/test/test-some.mf diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java index 94be03769..f95f5ed91 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -18,10 +18,7 @@ import org.tests.model.controller.TestBeanFindController; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanFindControllerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java index f366a6d1d..042fb1b58 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -5,7 +5,6 @@ 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; @@ -215,7 +214,7 @@ public class PathPropertiesTests extends BaseTestCase { String asJson = DB.json().toJson(list, pathProps); log.info("Json: {}", asJson); } - + @Test public void test_withAllPropsQuery() { PathProperties root = PathProperties.parse("*,billingAddress(line1)"); diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java similarity index 84% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java index 30708eda0..212c41bb5 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.BaseTestCase; @@ -9,12 +9,13 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.support.DocStoreBeanBaseAdapter; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import java.io.IOException; -import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class DocStoreBeanBaseAdapterTest extends BaseTestCase { @@ -31,9 +32,9 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { TDAdapter adapter = new TDAdapter<>(orderDesc, deployDesc); - assertThat(adapter.indexName()).isEqualTo("order"); - assertThat(adapter.indexType()).isEqualTo("order"); - assertThat(adapter.getQueueId()).isEqualTo("order"); + Assertions.assertThat(adapter.indexName()).isEqualTo("order"); + Assertions.assertThat(adapter.indexType()).isEqualTo("order"); + Assertions.assertThat(adapter.getQueueId()).isEqualTo("order"); } static class TDAdapter extends DocStoreBeanBaseAdapter { diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java index 3c10ee57e..1a626481c 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.DB; import io.ebean.Database; @@ -6,6 +6,7 @@ import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.support.DocStoreDeleteEvent; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java index e353f1a01..241642e90 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.DB; import io.ebean.Database; @@ -6,6 +6,7 @@ import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.support.DocStoreIndexEvent; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java index 1a9a52669..beea174a2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java @@ -1,5 +1,6 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; +import io.ebeaninternal.api.BindParams; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java index 51a46d3bf..d7bb51473 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java @@ -1,7 +1,8 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.ebean.DB; import io.ebean.TxScope; +import io.ebeaninternal.api.HelpScopeTrans; 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/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java index d20108a20..35980dc93 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.ebean.annotation.Platform; +import io.ebeaninternal.api.PlatformMatch; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -12,7 +14,7 @@ public class PlatformMatchTest { @Test public void match() { - assertTrue(PlatformMatch.matchPlatform(Platform.H2, "h2")); + Assertions.assertTrue(PlatformMatch.matchPlatform(Platform.H2, "h2")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql,h2")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql,h2,")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql , h2 ,")); diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index d4b0e4b20..de0e61945 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.avaje.lang.NonNullApi; import io.ebean.*; @@ -17,6 +17,7 @@ import io.ebean.plugin.Property; import io.ebean.plugin.SpiServer; import io.ebean.text.csv.CsvReader; import io.ebean.text.json.JsonContext; +import io.ebeaninternal.api.*; import io.ebeaninternal.api.SpiQuery.Type; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.core.timezone.DataTimeZone; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 2cf23625b..f1b06631d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.avaje.lang.NonNullApi; import io.ebean.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java index a0bd66adb..49d6a553a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.extraddl.model; +package io.ebean.xtest.internal.model; import io.ebean.annotation.Platform; +import io.ebeaninternal.extraddl.model.ExtraDdl; +import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 61956ace5..7f8c2231a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,8 +1,8 @@ -package io.ebeaninternal.server.cluster.binarymessage; +package io.ebean.xtest.internal.server.cluster.binarymessage; import io.ebean.BaseTestCase; import io.ebean.EbeanServer; -import io.ebeaninternal.api.TDSpiEbeanServer; +import io.ebean.xtest.internal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; import io.ebeaninternal.server.cache.RemoteCacheEvent; import io.ebeaninternal.server.cluster.BinaryTransactionEventReader; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java similarity index 96% rename from ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java index 9a45dad71..97f71318a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.executor; +package io.ebean.xtest.internal.server.executor; import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java index 89201f9a7..366b5ec6a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.grammer; +package io.ebean.xtest.internal.server.grammer; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -8,6 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.grammer.EqlParser; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java index f311dff3a..12c477564 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java @@ -2,29 +2,24 @@ * Licensed Materials - Property of FOCONIS AG * (C) Copyright FOCONIS AG. */ -package io.ebeaninternal.server.idgen; +package io.ebean.xtest.internal.server.idgen; import io.ebean.config.dbplatform.PlatformIdGenerator; - +import io.ebeaninternal.server.idgen.UuidV1IdGenerator; +import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator; +import io.ebeaninternal.server.idgen.UuidV4IdGenerator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.Map; import java.util.Properties; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.within; +import static org.assertj.core.api.Assertions.*; /** * Run some simple tests for the UUID generator. diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java index f07ffe3a6..3cd0582fc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib; +package io.ebean.xtest.internal.server.lib; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java index 5c1f8c879..dfabbaada 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java @@ -1,6 +1,7 @@ -package io.ebeaninternal.server.persist; +package io.ebean.xtest.internal.server.persist; +import io.ebeaninternal.server.persist.Flags; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java similarity index 68% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java index b9bf22ae9..2ec81e806 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java @@ -1,5 +1,7 @@ -package io.ebeaninternal.server.persist; +package io.ebean.xtest.internal.server.persist; +import io.ebeaninternal.server.persist.TrimLogSql; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +10,7 @@ public class TrimLogSqlTest { @Test public void trim() { - assertThat(TrimLogSql.trim("hello")).isEqualTo("hello"); + Assertions.assertThat(TrimLogSql.trim("hello")).isEqualTo("hello"); assertThat(TrimLogSql.trim("hello\nthere")).isEqualTo("hello\\n there"); assertThat(TrimLogSql.trim("a\nb\nc\nd")).isEqualTo("a\\n b\\n c\\n d"); assertThat(TrimLogSql.trim("a\n\nb")).isEqualTo("a\\n \\n b"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java similarity index 83% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java index 3d33ca922..ee1ee4fa6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java @@ -1,5 +1,6 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; +import io.ebeaninternal.server.query.DefaultSqlRow; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java similarity index 61% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java index 3286c7e4b..6c110457b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java @@ -1,85 +1,85 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.query.LimitOffsetPagedList; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class LimitOffsetPagedListTest extends BaseTestCase { private SpiEbeanServer server = spiEbeanServer(); @Test public void getPageIndex_when_firstRowsZero() { - assertEquals(limit(0, 10).getPageIndex(), 0); + Assertions.assertEquals(limit(0, 10).getPageIndex(), 0); } @Test public void getPageIndex_when_10_10() { - assertEquals(limit(10, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(10, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_20_10() { - assertEquals(limit(20, 10).getPageIndex(), 2); + Assertions.assertEquals(limit(20, 10).getPageIndex(), 2); } @Test public void getPageIndex_when_1_10() { - assertEquals(limit(1, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(1, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_9_10() { - assertEquals(limit(1, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(1, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_10_4() { - assertEquals(limit(10, 4).getPageIndex(), 3); + Assertions.assertEquals(limit(10, 4).getPageIndex(), 3); } @Test public void getPageIndex_when_10_5() { - assertEquals(limit(10, 5).getPageIndex(), 2); + Assertions.assertEquals(limit(10, 5).getPageIndex(), 2); } @Test public void getPageIndex_when_10_9() { - assertEquals(limit(10, 9).getPageIndex(), 2); + Assertions.assertEquals(limit(10, 9).getPageIndex(), 2); } @Test public void getPageIndex_when_10_11() { - assertEquals(limit(10, 11).getPageIndex(), 1); + Assertions.assertEquals(limit(10, 11).getPageIndex(), 1); } @Test public void getPageIndex_when_21_10() { - assertEquals(limit(21, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(21, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_29_10() { - assertEquals(limit(29, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(29, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_30_10() { - assertEquals(limit(30, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(30, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_31_10() { - assertEquals(limit(31, 10).getPageIndex(), 4); + Assertions.assertEquals(limit(31, 10).getPageIndex(), 4); } @Test public void getPageIndex_when_40_10() { - assertEquals(limit(40, 10).getPageIndex(), 4); + Assertions.assertEquals(limit(40, 10).getPageIndex(), 4); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java index 7351ab2f4..fce38554a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.util.SplitName; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java index 194d92aa0..bd44347c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java @@ -1,6 +1,9 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.*; +import io.ebeaninternal.server.query.QueryFutureIds; +import io.ebeaninternal.server.query.QueryFutureList; +import io.ebeaninternal.server.query.QueryFutureRowCount; 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/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java index c4fa0d4c9..5af99b4ef 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java @@ -1,10 +1,11 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -25,16 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; public class TestRawSqlBuilder extends BaseTestCase { - @Test - public void testDeriveProperty() { - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some_other")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.some_other")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.someOther")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some")).isEqualTo("some"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "someOther")).isEqualTo("someOther"); - } - private Sql getSql(String sqlStatement) { RawSql r = RawSqlBuilder.parse(sqlStatement).create(); return ((SpiRawSql) r).getSql(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java similarity index 87% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java index 7ea56e68f..6111930f7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java @@ -1,7 +1,8 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java index 70914dace..faaf7638d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java @@ -1,8 +1,9 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java index a7a24f512..b05eb5ff6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java @@ -1,10 +1,11 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.text.json.DJsonScalar; import io.ebeaninternal.server.type.DefaultTypeManager; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java index 054269e66..880c62c7e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java index 682e76363..825b0bf1d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java index faf74d993..8b41dad56 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -6,6 +6,7 @@ import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.text.json.WriteJson; 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/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java index ec9514c72..b27351f2f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.DB; import io.ebean.FetchPath; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java index 236d3a2fc..6879eb0ba 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java @@ -1,9 +1,13 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import org.junit.jupiter.api.Test; -import org.tests.model.basic.*; +import org.tests.model.basic.Car; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Vehicle; import static org.assertj.core.api.Assertions.assertThat; @@ -173,17 +177,17 @@ class DefaultPersistenceContextTest { pc.beginIterate(); assertThat(pc.size(Customer.class)).isEqualTo(100); assertThat(pc.size(Contact.class)).isEqualTo(1010); - + addCustomers(pc, 200, 100); addContacts(pc, 2000, 1010); - + assertThat(pc.size(Customer.class)).isEqualTo(200); assertThat(pc.size(Contact.class)).isEqualTo(2020); pc.endIterate(); - + System.gc(); Thread.sleep(50); // give the GC some time - + assertThat(pc.size(Customer.class)).isEqualTo(100); assertThat(pc.size(Contact.class)).isEqualTo(1010); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java index 758ee8964..fad77a311 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java index 9fe2386c7..0e6a66f31 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.*; import io.ebean.annotation.ForPlatform; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java index ac3eeacf9..ce9e420b8 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java similarity index 82% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java index db62950e7..905118c47 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebeaninternal.server.cache.RemoteCacheEvent; +import io.ebeaninternal.server.transaction.RemoteTableMod; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java index d567fc8f7..e7f70f66c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -8,6 +8,7 @@ import io.ebeaninternal.api.ScopedTransaction; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransactionManager; +import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java similarity index 81% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java index c4bb4aafd..6d104dc70 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java @@ -1,11 +1,15 @@ -package io.ebeaninternal.server.transaction; - -import io.ebean.*; +package io.ebean.xtest.internal.server.transaction; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Transaction; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.tests.model.basic.relates.*; +import org.tests.model.basic.relates.Relation1; +import org.tests.model.basic.relates.Relation2; +import org.tests.model.basic.relates.Relation3; +import org.tests.model.basic.relates.Relation4; class TransactionTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java index fce49b1dc..4fa963827 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java @@ -3,6 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,9 +37,9 @@ public class DbMigrationDropHistoryTest { @Test public void lastVersion_no_v_Prefix() { File d = new File("src/test/resources/migrationtest-history/dbmigration"); - assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2"); + Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2"); } - + public static void main(String[] args) throws IOException { logger.info("start"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java index d8b6a729e..82b74862d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; *
  • misc.migration.v1_1 modified v1_0 - every migration change, that ebean supports should be done here. *
  • misc.migration.v1_2 This is (nearly) the same as v1_0 and simulates every migration change in the other way * - * + * * Changes in the migration scripts should be committed after they are reviewed (changes may be legitime or show, that something is broken). * The {@link DbMigrationTest} will execute the generated scripts for various platforms. * @author Roland Praml, FOCONIS AG @@ -64,7 +64,7 @@ public class DbMigrationGenerateTest { // for platforms like DB2-LUW, we specify the exact platform in the migration path // see https://github.com/ebean-orm/ebean-migration/issues/102 migration.addPlatform(Platform.DB2LUW, "db2luw"); - migration.addPlatform(Platform.DB2FORI, "db2fori"); + migration.addPlatform(Platform.DB2FORI, "db2fori"); migration.addPlatform(Platform.DB2ZOS, "db2zos"); migration.addPlatform(Platform.DB2, "db2legacy"); migration.addPlatform(Platform.GENERIC); diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index 16c017c69..51115c8c3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -9,6 +9,7 @@ import io.ebean.datasource.pool.ConnectionPool; import misc.migration.v1_0.ETable; import misc.migration.v1_1.EHistory; import misc.migration.v1_1.EHistory2; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.io.File; @@ -45,7 +46,7 @@ public class DbMigrationTest extends BaseTestCase { @Test public void lastVersion() { File d = new File("src/test/resources/migrationtest/dbmigration/h2"); - assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4"); + Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4"); assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("1.5"); assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("1.4"); } @@ -100,7 +101,7 @@ public class DbMigrationTest extends BaseTestCase { if (isSqlServer() || isMariaDB() || isMySql() || isHana()) { runScript("I__create_procs.sql"); } - + if(isDb2()) { runScript("I__create_tablespaces.sql"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 13a25e08a..8ee34d246 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -6,6 +6,7 @@ import io.ebean.event.AbstractBeanPersistListener; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; @@ -46,7 +47,7 @@ public class BeanDescriptor_registerTest { Controller2 controller2 = new Controller2(); desc.register(controller2); - assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size()); + Assertions.assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size()); desc.deregister(controller1); assertEquals(1, ((ChainedBeanPersistController) desc.persistController()).size()); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index 4ca2a3681..76462d577 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -3,13 +3,12 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.BWithQIdent; import org.tests.model.basic.Customer; -import static org.assertj.core.api.Assertions.assertThat; - public class DeployPropertyParserTest extends BaseTestCase { @@ -21,67 +20,67 @@ public class DeployPropertyParserTest extends BaseTestCase { @Test public void from_prefix_expect_unchanged() { - assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)"); + Assertions.assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)"); } @Test public void depth0_path() { - assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post"); + Assertions.assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post"); } @Test public void depth1_path() { - assertThat(parser().parse("billingAddress.city")).isEqualTo("${billingAddress}city"); + Assertions.assertThat(parser().parse("billingAddress.city")).isEqualTo("${billingAddress}city"); } @Test public void depth2_path() { - assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)"); + Assertions.assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)"); } @Test public void simpleMax() { - assertThat(parser().parse("max(name)")).isEqualTo("max(${}name)"); + Assertions.assertThat(parser().parse("max(name)")).isEqualTo("max(${}name)"); } @Test public void combined() { - assertThat(parser().parse("sum(status * name)")).isEqualTo("sum(${}status * ${}name)"); + Assertions.assertThat(parser().parse("sum(status * name)")).isEqualTo("sum(${}status * ${}name)"); } @Test public void combined_withAtColumn() { - assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')"); + Assertions.assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')"); } @Test public void withExplicitQuote_all_platforms() { - assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?"); - assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?"); - assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?"); } @Test @ForPlatform({Platform.H2, Platform.POSTGRES}) public void withQuote_when_match_h2() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?"); } @Test @ForPlatform(Platform.SQLSERVER) public void withQuote_when_match_sqlserver() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?"); } @Test @ForPlatform(Platform.MYSQL) public void withQuote_when_match_mysql() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?"); } @Test public void unknown_path() { - assertThat(parser().parse(" foo ")).isEqualTo(" foo "); + Assertions.assertThat(parser().parse(" foo ")).isEqualTo(" foo "); } private DeployPropertyParser parser() { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java deleted file mode 100644 index 403fc3d8d..000000000 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.ebeaninternal.server.deploy.generatedproperty; - -import io.ebean.BaseTestCase; -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.deploy.BeanProperty; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - - -public class GeneratedCounterLongTest extends BaseTestCase { - - private GeneratedCounterLong counter = new GeneratedCounterLong(); - - private BeanProperty version = getBeanDescriptor(Customer.class).beanProperty("version"); - - @Test - public void when_null_expect_IllegalStateException() { - Customer customer = new Customer(); - assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis())); - } - - @Test - public void when_set_expect_incremented() { - Customer customer = new Customer(); - customer.setVersion(7L); - Object value = counter.getUpdateValue(version, (EntityBean) customer, System.currentTimeMillis()); - - assertThat(value).isEqualTo(8L); - } - -} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index 43fd9126b..32780f20f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,12 +1,11 @@ package io.ebeaninternal.server.expression; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; - public class AllEqualsExpressionTest extends BaseExpressionTest { @Test @@ -18,7 +17,7 @@ public class AllEqualsExpressionTest extends BaseExpressionTest { @Test public void isSameByBind_when_sameMultiple() { - assertThat(exp("a", 10, "b", "23").isSameByBind(exp("a", 10, "b", "23"))).isTrue(); + Assertions.assertThat(exp("a", 10, "b", "23").isSameByBind(exp("a", 10, "b", "23"))).isTrue(); } @Test @@ -78,13 +77,13 @@ public class AllEqualsExpressionTest extends BaseExpressionTest { @Test public void isSameByBind_when_diffBindByNull_last() { - assertThat(exp("a", 10).isSameByBind(exp("a", null))).isFalse(); + Assertions.assertThat(exp("a", 10).isSameByBind(exp("a", null))).isFalse(); } @Test public void isSameByBind_when_diffBindByNull_first() { - assertThat(exp("a", null).isSameByBind(exp("a", 10))).isFalse(); + Assertions.assertThat(exp("a", null).isSameByBind(exp("a", 10))).isFalse(); } private AllEqualsExpression exp(Map propMap) { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java index 76e3d27a3..3b6f26d7e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.expression; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class SameTest { @Test public void sameByNull() throws Exception { - assertThat(Same.sameByNull("a", "a")).isTrue(); + Assertions.assertThat(Same.sameByNull("a", "a")).isTrue(); assertThat(Same.sameByNull("a", "b")).isTrue(); assertThat(Same.sameByNull(null, null)).isTrue(); assertThat(Same.sameByNull("a", null)).isFalse(); diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index e8d8f0763..9bc8ee032 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -1,20 +1,10 @@ package misc.migration.v1_0; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; -import io.ebean.annotation.Tablespace; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.io.File; import java.sql.Timestamp; import java.util.List; @@ -22,7 +12,7 @@ import java.util.List; @Entity @Table(name = "migtest_e_basic") // Note: tablespaces are currently only supported for DB2 -// to be prepared for future (when we support sql server filegroups), +// to be prepared for future (when we support sql server filegroups), // we allow to specify the DB-platform here @Tablespace(value = "db2;TSTABLES;", index = "db2;INDEXTS;") public class EBasic { @@ -52,7 +42,7 @@ public class EBasic { @Size(max=127) String description; - + @Lob @Column(columnDefinition = "db2;blob(64M);") File descriptionFile; @@ -60,7 +50,7 @@ public class EBasic { @DbJson @Column(columnDefinition = "db2;clob(16K) inline length 500 compact;") List jsonList; - + @NotNull @DbDefault("X") @Column(columnDefinition = "db2;clob(16K) inline length 500 not logged;") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index ec2381650..fc659f270 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -1,20 +1,20 @@ package misc.migration.v1_0; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Tablespace; - @Entity @Table(name = "migtest_e_history") @Tablespace("db2;MAIN;") public class EHistory { - + @Id Integer id; - - + + String testString; } diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java index 116094997..964f76605 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; - // table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java index 7dfd5948e..dce7920af 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_0; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index a8773205d..d7f1829c5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -1,11 +1,7 @@ package misc.migration.v1_1; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.History; -import io.ebean.annotation.Platform; -import io.ebean.annotation.Tablespace; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java index cbca4b4b2..6372c9233 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_1; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History // FIXME: remove later diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 3ba02c2a5..344ebb4df 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -1,12 +1,11 @@ package misc.migration.v1_1; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; - -import io.ebean.annotation.Tablespace; - import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 3c132c2c9..4507821be 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -1,13 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; - import io.ebean.annotation.Tablespace; +import javax.persistence.*; import java.util.List; @Entity @@ -25,7 +20,7 @@ public class MtmMaster { @ElementCollection List phoneNumbers; - + public Long getId() { return id; } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index b80603673..75246ce3e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -1,19 +1,10 @@ package misc.migration.v1_2; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.io.File; import java.sql.Timestamp; import java.util.List; @@ -47,7 +38,7 @@ public class EBasic { @Size(max=127) String description; - + @Lob @Column(columnDefinition = "db2;blob(64M);") File descriptionFile; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index ab2fbdf33..e4d0e9506 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -1,20 +1,20 @@ package misc.migration.v1_2; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Tablespace; - @Entity @Table(name = "migtest_e_history") @Tablespace("db2;MAIN;") public class EHistory { - + @Id Integer id; - - + + Long testString; // keep it as long as history prevents altering } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java index 6832092bf..38ae02730 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; - //table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java index 4fff00ce3..6192e7f71 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_2; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index 4729929c9..b873d3be6 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteImportedPartial extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 98b837db2..a31a70666 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteOneToOne extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index af51fdec5..18ba4d2ab 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteOneToOneMultiple extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index f69f38669..b493a23e7 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -10,9 +10,7 @@ import javax.persistence.OptimisticLockException; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; public class TestIUDVanilla extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index a72f07264..920b94ed5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -3,7 +3,6 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -13,7 +12,7 @@ import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertSame; class TestLoadBeanCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index f17c9862a..2d8ad58b4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import static org.junit.jupiter.api.Assertions.assertNotNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestSaveDeleteOneToOne extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index b357445e5..d32899dfb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNotNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { // public void testCreateDeletePFile() { diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java index a08e30f0f..059fd9a6d 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java @@ -1,13 +1,5 @@ package org.tests.cache; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.util.concurrent.Callable; - -import org.junit.jupiter.api.Test; -import org.tests.model.basic.OCachedBean; - import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; @@ -17,9 +9,16 @@ import io.ebean.config.CurrentTenantProvider; import io.ebean.config.DatabaseConfig; import io.ebean.config.MdcBackgroundExecutorWrapper; import io.ebeaninternal.server.cache.DefaultServerCachePlugin; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.OCachedBean; + +import java.util.concurrent.Callable; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** - * Test class testing async/background cache updates in a multi-tenant environment. + * Test class testing async/background cache updates in a multi-tenant environment. */ public class TestBeanCacheAsync extends BaseTestCase { @@ -63,7 +62,7 @@ public class TestBeanCacheAsync extends BaseTestCase { }; } } - + @Test public void findById_with_tenant() throws InterruptedException { DatabaseConfig config = new DatabaseConfig(); @@ -81,7 +80,7 @@ public class TestBeanCacheAsync extends BaseTestCase { config.setBackgroundExecutorWrapper( new MdcBackgroundExecutorWrapper().with(new TenantCopyBackgroundExecutorWrapper())); tenantId.set("4711"); - + Database db = DatabaseFactory.create(config); try { OCachedBean bean = new OCachedBean(); @@ -95,7 +94,7 @@ public class TestBeanCacheAsync extends BaseTestCase { db.save(bean0); Thread.sleep(100); // TODO: can we block finds on that ID if a pending cache update is present? - + bean0 = db.find(OCachedBean.class, bean.getId()); assertNotNull(bean0); assertThat(bean0.getName()).isEqualTo("findById2"); diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index f127101f9..5a5b06fc0 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -16,10 +16,7 @@ import java.util.List; import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index 0b82b7c33..ac4adb358 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestConstructorPutfieldReplacement extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java index 91a94d2e0..474e4902a 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java @@ -1,21 +1,17 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import javax.persistence.*; @Entity public class GenKeySeqB { public final static String SEQUENCE_NAME = "GEN_KEY_B_SEQ_NAME"; - + private final static String SEQ_GEN_NAME = "SEQ_GEN_NAME"; /** * {@link GeneratedValue#generator()} links to {@link SequenceGenerator#name()}. - * The name of the sequence is {@link SequenceGenerator#sequenceName()}. + * The name of the sequence is {@link SequenceGenerator#sequenceName()}. */ @Id @SequenceGenerator(name = SEQ_GEN_NAME, sequenceName = GenKeySeqB.SEQUENCE_NAME) diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index 5ee67e02b..39971b716 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -7,7 +7,6 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.json.EJson; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMap; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 19d2bfd48..8f36be0cb 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -1,11 +1,9 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; - -import javax.persistence.*; - import org.tests.model.basic.Cat; +import javax.persistence.*; import java.util.UUID; @@ -25,7 +23,7 @@ public class MainEntityRelation { @JoinColumn(name = "id2") @DbForeignKey(noConstraint = true) private MainEntity entity2; - + @ManyToOne @JoinColumn(name = "cat_id") @DbForeignKey(noConstraint = true) diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java index 680fdf169..410b0cbf3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,12 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; - - +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java index ba3d3cbf2..e49d35903 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java @@ -1,12 +1,14 @@ package org.tests.model.basic.relates; -import java.util.UUID; - -import javax.persistence.*; - import io.ebean.annotation.ChangeLog; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import java.util.UUID; + /** * Relation entity */ @@ -60,5 +62,5 @@ public class Relation1 { public void setWithCascade(Relation2 withCascade) { this.withCascade = withCascade; } - + } diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java index 826e3564e..249d137e4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java @@ -1,12 +1,12 @@ package org.tests.model.basic.relates; -import java.util.UUID; - -import javax.persistence.*; - import io.ebean.annotation.ChangeLog; +import javax.persistence.Entity; +import javax.persistence.Id; +import java.util.UUID; + /** * Relation entity */ diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccess.java b/ebean-test/src/test/java/org/tests/model/join/HAccess.java index e62484d96..d0d0608f1 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccess.java @@ -1,15 +1,10 @@ package org.tests.model.join; -import java.util.UUID; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - import io.ebean.annotation.DbForeignKey; +import javax.persistence.*; +import java.util.UUID; + @Inheritance @Entity public abstract class HAccess { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 62dff12e4..a6449bbca 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -3,7 +3,6 @@ package org.tests.model.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java index 96539b0ea..f64a6a81e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java @@ -1,17 +1,10 @@ package org.tests.model.onetoone; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; - import io.ebean.annotation.Where; +import javax.persistence.*; +import java.util.List; + @Entity public class OtoChildVersion { @@ -25,12 +18,12 @@ public class OtoChildVersion { @Version int version; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "ref_id") @Where(clause = "${mta}.type=1") List notifications; - + public Integer getId() { return id; } @@ -54,7 +47,7 @@ public class OtoChildVersion { public void setMaster(OtoMasterVersion master) { this.master = master; } - + public int getVersion() { return version; } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java index 2339d0f09..aa26d4ad5 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java @@ -1,17 +1,10 @@ package org.tests.model.onetoone; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; - import io.ebean.annotation.Where; +import javax.persistence.*; +import java.util.List; + @Entity public class OtoMasterVersion { @@ -25,12 +18,12 @@ public class OtoMasterVersion { @Version int version; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "ref_id") @Where(clause = "${mta}.type=0") List notifications; - + public Long getId() { return id; } @@ -62,5 +55,5 @@ public class OtoMasterVersion { public void setVersion(int version) { this.version = version; } - + } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index e4875af11..088d98c9d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -3,7 +3,6 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; - import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -32,7 +31,7 @@ public class TestOneToOneCascadeSave extends BaseTestCase { OtoMaster master2 = child2.getMaster(); assertNotNull(master2); } - + @Test public void testSaveCascadeWithOneToOne() { OtoMasterVersion master = new OtoMasterVersion(); @@ -40,19 +39,19 @@ public class TestOneToOneCascadeSave extends BaseTestCase { OtoChildVersion child = new OtoChildVersion(); child.setName("c1"); - + master.setChild(child); DB.save(master); - + assertThat(master.getVersion()).isEqualTo(1); assertThat(child.getVersion()).isEqualTo(1); - + child.setName("c2"); DB.save(master); - + assertThat(master.getVersion()).isEqualTo(1); assertThat(child.getVersion()).isEqualTo(2); - + try (Transaction txn = DB.beginTransaction()) { master = DB.find(OtoMasterVersion.class).findOne(); @@ -61,10 +60,10 @@ public class TestOneToOneCascadeSave extends BaseTestCase { child = DB.find(OtoChildVersion.class).findOne(); assertThat(child.getVersion()).isEqualTo(2); child.setName("c3"); - DB.save(child); - + DB.save(child); + txn.commit(); } } - + } 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 e8cb48160..fc02c2133 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 @@ -4,7 +4,6 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -37,7 +36,7 @@ public class TestCsvReader extends TransactionalTestCase { csvReader.addProperty("billingAddress.country.code"); csvReader.process(reader); - + } } 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 efa424d07..af2ccd4a3 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 @@ -5,7 +5,6 @@ import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java index b95c889e7..d0bf62f9c 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -5,10 +5,12 @@ import io.ebean.DB; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.LineNumberReader; +import java.io.Reader; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index 95ce27683..d140b46d7 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -17,7 +17,8 @@ import org.tests.model.basic.ResetBasicData; import java.io.IOException; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestTextJsonReferenceBean extends BaseTestCase {