Move some unit tests from ebean-test back to ebean-core

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

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"));

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();

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");

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());
   }
 

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);
+  }
+
+}

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<String, Method> 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");

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();
     });

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("");

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.<init>")).isEqualTo("ProfileLocationTest$Other.init");
   }
 

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

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

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();

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)"));
   }
 }

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;

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() {
 

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 {

ebean-core/src/test/java/org/tests/model/basic/Contact.java

@@ -0,0 +1,4 @@
+package org.tests.model.basic;
+
+public class Contact {
+}

ebean-core/src/test/java/org/tests/model/basic/Customer.java

@@ -0,0 +1,4 @@
+package org.tests.model.basic;
+
+public class Customer {
+}

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.*;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BeanFindControllerTest extends BaseTestCase {
 

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)");

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<Order> adapter = new TDAdapter<>(orderDesc, deployDesc);
 
-    assertThat(adapter.indexName()).isEqualTo("order");
+    Assertions.assertThat(adapter.indexName()).isEqualTo("order");
-    assertThat(adapter.indexType()).isEqualTo("order");
+    Assertions.assertThat(adapter.indexType()).isEqualTo("order");
-    assertThat(adapter.getQueueId()).isEqualTo("order");
+    Assertions.assertThat(adapter.getQueueId()).isEqualTo("order");
   }
 
   static class TDAdapter<T> extends DocStoreBeanBaseAdapter<T> {

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;

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;

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;

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;

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 ,"));

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;

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.*;

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;

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;

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;

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;

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.*;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 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.*;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assertions.within;
 
 /**
  * Run some simple tests for the UUID generator.

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;

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;

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");

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;

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);
   }
 
 

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;

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;

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();

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;
 

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;

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;
 

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;

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;

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;

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;

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);
   }

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;
 

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;

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;