Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-ddl-generator/pom.xml
#	ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesTest.java
#	ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonMillisTest.java
#	ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonNanosTest.java

ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.xtest.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -20,12 +20,12 @@ import java.sql.Timestamp;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class CacheBeanDataTest extends BaseTestCase {
+public class CacheBeanDataTest {
 
   @Test
   public void extract_load_on_customer() {
 
-    SpiEbeanServer server = spiEbeanServer();
+    SpiEbeanServer server = (SpiEbeanServer)DB.getDefault();
     BeanDescriptor<Customer> desc = server.descriptor(Customer.class);
 
     Customer c = new Customer();
@@ -77,7 +77,7 @@ public class CacheBeanDataTest extends BaseTestCase {
   @Test
   public void extract_load_withEmbeddedBean() {
 
-    SpiEbeanServer server = spiEbeanServer();
+    SpiEbeanServer server = (SpiEbeanServer)DB.getDefault();
     BeanDescriptor<EPerson> desc = server.descriptor(EPerson.class);
     BeanPropertyAssocOne<?> addressBeanProperty = (BeanPropertyAssocOne<?>) desc.beanProperty("address");
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.xtest.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -17,9 +17,9 @@ import java.util.Map;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class CachedBeanDataFromBeanTest extends BaseTestCase {
+public class CachedBeanDataFromBeanTest {
 
-  private final SpiEbeanServer server = spiEbeanServer();
+  private final SpiEbeanServer server = (SpiEbeanServer)DB.getDefault();
 
   @Test
   public void extract() {
@@ -84,7 +84,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
     // mutate, dirty
     contact.setLastName("Banana");
 
-    final BeanDescriptor<Contact> desc = getBeanDescriptor(Contact.class);
+    final BeanDescriptor<Contact> desc = server.descriptor(Contact.class);
     CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, entityBean);
 
     final Map<String, Object> data = cacheData.getData();
@@ -115,7 +115,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
     contact.setCustomer(customer2);
     contact.setLastName("Banana");
 
-    final BeanDescriptor<Contact> desc = getBeanDescriptor(Contact.class);
+    final BeanDescriptor<Contact> desc = server.descriptor(Contact.class);
     CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, entityBean);
 
     final Map<String, Object> data = cacheData.getData();

ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java

@@ -1,27 +1,26 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.TBytesOnly;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+public class CachedBeanDataSerializeTest {
 
-public class CachedBeanDataSerializeTest extends BaseTestCase {
+  private final SpiEbeanServer db = (SpiEbeanServer)DB.getDefault();
 
   @Test
   public void write() throws IOException, ClassNotFoundException {
@@ -58,16 +57,13 @@ public class CachedBeanDataSerializeTest extends BaseTestCase {
 
   @Test
   public void fullBean() throws IOException, ClassNotFoundException {
+    Customer customer = new Customer();
+    customer.setId(42);
+    customer.setName("FooBar");
+    customer.setStatus(Customer.Status.INACTIVE);
+    customer.setVersion(3L);
 
-    ResetBasicData.reset();
-
-    List<Customer> customers = DB.find(Customer.class)
-      .order().asc("id")
-      .setMaxRows(1).findList();
-
-    Customer customer = customers.get(0);
-
-    BeanDescriptor<Customer> desc = getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> desc = db.descriptor(Customer.class);
     CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean) customer);
 
     ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -97,7 +93,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase {
     bean.setId(42);
     bean.setContent(stringContent.getBytes(StandardCharsets.UTF_8));
 
-    BeanDescriptor<TBytesOnly> desc = getBeanDescriptor(TBytesOnly.class);
+    BeanDescriptor<TBytesOnly> desc = db.descriptor(TBytesOnly.class);
     CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean) bean);
 
     ByteArrayOutputStream os = new ByteArrayOutputStream();

ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java

@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.core;
 
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.FetchConfig;
 import io.ebean.Query;
 import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
@@ -12,12 +12,16 @@ import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase {
+public class DefaultServer_createOrmQueryRequestTest {
 
   Query<Order> query() {
     return server().find(Order.class);
   }
 
+  private Database server() {
+    return DB.getDefault();
+  }
+
   OrmQueryRequest<Order> queryRequest(Query<Order> query) {
     return OrmQueryRequestTestHelper.queryRequest(query);
   }

ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;
@@ -19,7 +18,7 @@ import java.util.Set;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-class TestDiffHelpSimple extends BaseTestCase {
+class TestDiffHelpSimple {
 
   long firstTime = System.currentTimeMillis() - 10000;
   long secondTime = System.currentTimeMillis();

ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;
@@ -14,7 +13,7 @@ import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestDiffHelpWithEmbedded extends BaseTestCase {
+public class TestDiffHelpWithEmbedded {
 
   Database server;
 

ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java

@@ -0,0 +1,50 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.annotation.Platform;
+import io.ebeaninternal.api.SpiEbeanServer;
+import org.tests.model.basic.Animal;
+
+import javax.persistence.PersistenceException;
+
+public class BaseTest {
+
+  protected SpiEbeanServer db = (SpiEbeanServer)DB.getDefault();
+
+  protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
+    return db.descriptor(cls);
+  }
+
+  protected SpiEbeanServer spiEbeanServer() {
+    return db;
+  }
+
+  protected Database server() {
+    return db;
+  }
+
+  protected void initTables() {
+    try {
+      db.find(Animal.class).findCount();
+    } catch (PersistenceException e) {
+      db.script().run("/h2-init.sql");
+    }
+  }
+
+  protected boolean isH2() {
+    return isPlatform(Platform.H2);
+  }
+  protected boolean isPostgres() {
+    return isPlatform(Platform.POSTGRES);
+  }
+  protected boolean isSqlServer() {
+    return isPlatform(Platform.SQLSERVER);
+  }
+  protected boolean isMySql() {
+    return isPlatform(Platform.MYSQL);
+  }
+  protected boolean isPlatform(Platform platform) {
+    return db.platform().base().equals(platform);
+  }
+}

ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;
@@ -8,6 +7,7 @@ import io.ebeaninternal.server.core.CacheOptions;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.*;
 import org.tests.model.bridge.BSite;
@@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class BeanDescriptorTest extends BaseTestCase {
+public class BeanDescriptorTest extends BaseTest {
 
   private BeanDescriptor<Customer> customerDesc = spiEbeanServer().descriptor(Customer.class);
 
@@ -30,35 +30,37 @@ public class BeanDescriptorTest extends BaseTestCase {
 
     Customer bean = customerDesc.createReference(null, false, 42, null);
     assertThat(bean.getId()).isEqualTo(42);
-    assertThat(server().beanState(bean).isReadOnly()).isFalse();
+    Assertions.assertThat(server().beanState(bean).isReadOnly()).isFalse();
   }
 
   @Test
   public void createReference_whenReadOnly() {
 
     Customer bean = customerDesc.createReference(Boolean.TRUE, false, 42, null);
-    assertThat(server().beanState(bean).isReadOnly()).isTrue();
+    Assertions.assertThat(server().beanState(bean).isReadOnly()).isTrue();
   }
 
   @Test
   public void createReference_whenNotReadOnly() {
 
     Customer bean = customerDesc.createReference(Boolean.FALSE, false, 42, null);
-    assertThat(server().beanState(bean).isReadOnly()).isFalse();
+    Assertions.assertThat(server().beanState(bean).isReadOnly()).isFalse();
 
     bean = customerDesc.createReference(42, null);
-    assertThat(server().beanState(bean).isReadOnly()).isFalse();
+    Assertions.assertThat(server().beanState(bean).isReadOnly()).isFalse();
   }
 
   @Test
   public void createReference_when_disabledLazyLoad() {
 
     Customer bean = customerDesc.createReference(Boolean.FALSE, true, 42, null);
-    assertThat(server().beanState(bean).isDisableLazyLoad()).isTrue();
+    Assertions.assertThat(server().beanState(bean).isDisableLazyLoad()).isTrue();
   }
 
   @Test
   public void createReference_with_inheritance() {
+    initTables();
+
     Cat cat = new Cat();
     cat.setName("Puss");
     DB.save(cat);

ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
@@ -9,7 +8,7 @@ import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BeanDescriptor_documentMappingTest extends BaseTestCase {
+public class BeanDescriptor_documentMappingTest extends BaseTest {
 
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.jupiter.api.Test;
@@ -10,9 +9,7 @@ import org.tests.model.basic.EBasic;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-
-public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase {
-
+public class BeanDescriptor_whenCreatedPropertyTest {
 
   @Test
   public void test() {

ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
@@ -8,7 +7,6 @@ import io.ebean.common.BeanList;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 
-public class BeanPropertyAssocManyTest extends BaseTestCase {
+public class BeanPropertyAssocManyTest extends BaseTest {
 
   private BeanDescriptor<Customer> customerDesc = spiEbeanServer().descriptor(Customer.class);
 
@@ -62,22 +60,22 @@ public class BeanPropertyAssocManyTest extends BaseTestCase {
     assertThat(customer.getContacts().get(0)).isSameAs(contact);
   }
 
-  @Test
-  public void findIdsByParentId() {
-
-    ResetBasicData.reset();
-
-    List<Long> ids = DB.find(Customer.class).orderBy("id").setMaxRows(2).findIds();
-
-    List<Object> customerIds = new ArrayList<>();
-    customerIds.add(ids.get(0));
-    customerIds.add(ids.get(1));
-
-    List<Object> contactIdsForOne = contacts().findIdsByParentId(ids.get(0), null, null, null, true);
-
-    List<Object> contactIdsForMultiple = contacts().findIdsByParentId(null, customerIds, null, null, true);
-
-    assertThat(contactIdsForOne).isNotEmpty();
-    assertThat(contactIdsForMultiple).isNotEmpty();
-  }
+//  @Test
+//  public void findIdsByParentId() {
+//
+//    ResetBasicData.reset();
+//
+//    List<Long> ids = DB.find(Customer.class).orderBy("id").setMaxRows(2).findIds();
+//
+//    List<Object> customerIds = new ArrayList<>();
+//    customerIds.add(ids.get(0));
+//    customerIds.add(ids.get(1));
+//
+//    List<Object> contactIdsForOne = contacts().findIdsByParentId(ids.get(0), null, null, null, true);
+//
+//    List<Object> contactIdsForMultiple = contacts().findIdsByParentId(null, customerIds, null, null, true);
+//
+//    assertThat(contactIdsForOne).isNotEmpty();
+//    assertThat(contactIdsForMultiple).isNotEmpty();
+//  }
 }

ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java

@@ -1,16 +1,12 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.xtest.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;
 
-
-public class DeployPropertyParserTest extends BaseTestCase {
+public class DeployPropertyParserTest extends BaseTest {
 
   private final BeanDescriptor<Customer> descriptor = getBeanDescriptor(Customer.class);
 
@@ -61,21 +57,14 @@ public class DeployPropertyParserTest extends BaseTestCase {
   }
 
   @Test
-  @ForPlatform({Platform.H2, Platform.POSTGRES})
   public void withQuote_when_match_h2() {
-    Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?");
-  }
-
-  @Test
-  @ForPlatform(Platform.SQLSERVER)
-  public void withQuote_when_match_sqlserver() {
-    Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?");
-  }
-
-  @Test
-  @ForPlatform(Platform.MYSQL)
-  public void withQuote_when_match_mysql() {
-    Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?");
+    if (isH2() || isPostgres()) {
+      Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?");
+    } else if (isSqlServer()) {
+      Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?");
+    } else if (isMySql()) {
+      Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?");
+    }
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java

@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class FormulaPropertyPathTest extends BaseTestCase {
+public class FormulaPropertyPathTest extends BaseTest {
 
   private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
 

ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;
@@ -19,7 +18,7 @@ import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
+public class TestBeanDescriptorHasIdProperty extends BaseTest {
 
   SpiEbeanServer spiServer;
 

ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
@@ -14,7 +13,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestCollectionLoadedStatus extends BaseTestCase {
+public class TestCollectionLoadedStatus {
 
   @Test
   public void test() {

ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java

@@ -1,10 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
@@ -19,18 +16,14 @@ import java.sql.Timestamp;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class TestDiffHelpInsertSimple extends BaseTestCase {
+public class TestDiffHelpInsertSimple extends BaseTest {
 
   private final long firstTime = System.currentTimeMillis() - 10000;
 
-  private final Database server;
-
   private final BeanDescriptor<Order> orderDesc;
 
   public TestDiffHelpInsertSimple() {
-    server = DB.getDefault();
-    SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    orderDesc = spiServer.descriptor(Order.class);
+    orderDesc = db.descriptor(Order.class);
   }
 
   private Order createBaseOrder(Database server) {
@@ -49,7 +42,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase {
 
     Date date = Date.valueOf("2000-01-01");
 
-    Order order1 = createBaseOrder(server);
+    Order order1 = createBaseOrder(db);
     order1.setOrderDate(date);
 
     StringWriter buffer = new StringWriter();

ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java

@@ -1,10 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.DB;
-import io.ebean.Database;
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.jupiter.api.Test;
 import org.tests.model.embedded.EMain;
@@ -15,14 +11,12 @@ import java.io.StringWriter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestDiffHelpInsertWithEmbedded extends BaseTestCase {
+public class TestDiffHelpInsertWithEmbedded extends BaseTest {
 
   private final BeanDescriptor<EMain> emainDesc;
 
   public TestDiffHelpInsertWithEmbedded() {
-    Database server = DB.getDefault();
-    SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    emainDesc = spiServer.descriptor(EMain.class);
+    emainDesc = getBeanDescriptor(EMain.class);
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java

@@ -1,18 +1,18 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.server.deploy.BaseTest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class BaseExpressionTest extends BaseTestCase {
+public abstract class BaseExpressionTest extends BaseTest {
 
   protected DefaultExpressionRequest newExpressionRequest() {
     BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);

ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.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;
@@ -14,7 +15,7 @@ public class BetweenPropertyExpressionTest extends BaseExpressionTest {
   public void sqlExpression() {
     TDSpiExpressionRequest request = new TDSpiExpressionRequest(null);
     exp("a", "b", 10).addSql(request);
-    assertThat(request.getSql()).isEqualTo(" ? between a and b");
+    Assertions.assertThat(request.getSql()).isEqualTo(" ? between a and b");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java

@@ -1,19 +1,16 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.LikeType;
-import io.ebean.Query;
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.api.ManyWhereJoins;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
-
-import static org.assertj.core.api.Assertions.assertThat;
 
 
 public class DefaultExampleExpressionTest extends BaseExpressionTest {
@@ -72,43 +69,9 @@ public class DefaultExampleExpressionTest extends BaseExpressionTest {
     TDSpiExpressionRequest req = new TDSpiExpressionRequest(customerBeanDescriptor());
     expr.addBindValues(req);
 
-    assertThat(req.bindValues).contains("name", "billingAddress.city");
-
-    Customer customer = customer();
-    customer.setName("Rob");
-    customer.getBillingAddress().setCity("Auckland");
-
-    ResetBasicData.reset();
-
-    Query<Customer> query1 = server().find(Customer.class)
-      .where().exampleLike(customer)
-      .query();
-
-    query1.findList();
-
-    assertThat(query1.getGeneratedSql()).contains("(t0.name like ");
-    assertThat(query1.getGeneratedSql()).contains(" and t1.city like ");
-
+    Assertions.assertThat(req.bindValues).contains("name", "billingAddress.city");
   }
 
-  @Test
-  public void emptyExampleBean() {
-
-    ResetBasicData.reset();
-
-    Customer customer = new Customer();
-
-    Query<Customer> query = server().find(Customer.class)
-      .where()
-      .eq("status", Customer.Status.NEW)
-      .exampleLike(customer)
-      .startsWith("name", "Rob")
-      .query();
-
-    query.findList();
-
-    assertThat(sqlOf(query)).contains("and 1=1 and t0.name like");
-  }
 
   private <T> OrmQueryRequest<T> create(SpiQuery<T> query) {
     return new OrmQueryRequest<>(null, null, query, null);

ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java

@@ -2,50 +2,29 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.DB;
 import io.ebean.Query;
-import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
-import org.tests.model.onetoone.album.Cover;
-
-import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 public class NoopExpressionTest extends BaseExpressionTest {
 
   @Test
   public void test() {
-
+    initTables();
     Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().add(NoopExpression.INSTANCE)
       .query();
 
     query.findList();
-    String generatedSql = sqlOf(query);
-
+    String generatedSql = query.getGeneratedSql();
     assertThat(generatedSql).contains("select t0.id from o_customer t0 where 1=1");
   }
 
-  @Test
-  public void test_withSoftDeleteBean() {
-
-    Query<Cover> query = DB.find(Cover.class)
-      .where().add(NoopExpression.INSTANCE)
-      .query();
-
-    LoggedSql.start();
-
-    query.findCount();
-
-    List<String> sql = LoggedSql.stop();
-    assertSql(sql.get(0)).contains("select count(*) from cover t0 where 1=1 and");
-  }
-
   @Test
   public void test_withPreAndPost() {
-
+    initTables();
     Query<Customer> query = DB.find(Customer.class)
       .select("id")
       .where().eq("name", null)
@@ -54,7 +33,7 @@ public class NoopExpressionTest extends BaseExpressionTest {
       .query();
 
     query.findList();
-    String generatedSql = sqlOf(query);
+    String generatedSql = query.getGeneratedSql();
 
     assertThat(generatedSql).contains("select t0.id from o_customer t0 where t0.name is null and 1=1 and t0.status is not null");
   }

ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.server.deploy.BaseTest;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 
@@ -12,7 +12,7 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class PrepareDocNestedTest extends BaseTestCase {
+public class PrepareDocNestedTest extends BaseTest {
   @Test
   public void prepare() throws Exception {
 

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java

@@ -1,19 +1,21 @@
 package io.ebeaninternal.server.querydefn;
 
 
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.CacheMode;
-import io.ebean.DB;
+import io.ebean.*;
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.core.DefaultServer;
 import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.core.OrmQueryRequestTestHelper;
+import io.ebeaninternal.server.deploy.BaseTest;
+import io.ebeaninternal.server.expression.BaseExpressionTest;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DefaultOrmQueryTest extends BaseTestCase {
+public class DefaultOrmQueryTest extends BaseExpressionTest {
 
   @Test
   public void when_forUpdate_then_excludeFromBeanCache() {
@@ -105,10 +107,10 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
   private <T> void prepare(DefaultOrmQuery<T> q1, DefaultOrmQuery<T> q2) {
 
-    OrmQueryRequest<T> r1 = createQueryRequest(SpiQuery.Type.LIST, q1, null);
+    OrmQueryRequest<T> r1 = OrmQueryRequestTestHelper.queryRequest(q1);
     q1.prepare(r1);
 
-    OrmQueryRequest<T> r2 = createQueryRequest(SpiQuery.Type.LIST, q2, null);
+    OrmQueryRequest<T> r2 = OrmQueryRequestTestHelper.queryRequest(q2);
     q2.prepare(r2);
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.xtest.BaseTestCase;
+import io.ebeaninternal.server.deploy.BaseTest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
@@ -8,7 +8,7 @@ import org.tests.model.basic.Order;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class OrmQueryDetailTest extends BaseTestCase {
+public class OrmQueryDetailTest extends BaseTest {
 
   OrmQueryDetail parse(String query) {
     return new OrmQueryDetailParser(query).parse();

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java

@@ -5,10 +5,10 @@ import io.ebean.ExpressionList;
 import io.ebean.Query;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.deploy.BaseTest;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
-import io.ebeaninternal.server.expression.BaseExpressionTest;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
@@ -16,7 +16,7 @@ import java.sql.Timestamp;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OrmQueryPlanKeyTest extends BaseExpressionTest {
+public class OrmQueryPlanKeyTest extends BaseTest {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   private DefaultOrmQuery<Customer> query() {

ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java

@@ -5,9 +5,9 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import org.junit.jupiter.api.Test;
-import org.tests.model.array.IntEnum;
-import org.tests.model.array.VarcharEnum;
 import org.tests.model.basic.Car;
+import org.tests.model.basic.IntEnum;
+import org.tests.model.basic.VarcharEnum;
 
 import javax.persistence.EnumType;
 import java.time.DayOfWeek;

ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java

@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.DB;
 import io.ebean.text.json.JsonContext;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TOne;
 
@@ -25,7 +26,7 @@ public class ScalarTypeBooleanTest {
     String json = jsonContext.toJson(bean);
     TOne tOne = jsonContext.toBean(TOne.class, json);
 
-    assertTrue(tOne.isActive());
+    Assertions.assertTrue(tOne.isActive());
     assertEquals(json, "{\"id\":42,\"active\":true}");
   }
 
@@ -39,7 +40,7 @@ public class ScalarTypeBooleanTest {
     String json = jsonContext.toJson(bean);
     TOne tOne = jsonContext.toBean(TOne.class, json);
 
-    assertFalse(tOne.isActive());
+    Assertions.assertFalse(tOne.isActive());
     assertEquals(json, "{\"id\":42,\"active\":false}");
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java

@@ -4,6 +4,7 @@ import io.ebean.DB;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TJodaEntity;
 
@@ -58,6 +59,6 @@ public class ScalarTypeJodaLocalTimeTest {
     String json = DB.json().toJson(bean);
     TJodaEntity bean1 = DB.json().toBean(TJodaEntity.class, json);
 
-    assertEquals(bean1.getLocalTime(), now);
+    Assertions.assertEquals(bean1.getLocalTime(), now);
   }
 }