Refactor tests, move some internal core tests to ebean-core

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/OrmQueryRequestTestHelper.java

@@ -0,0 +1,18 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.DB;
+import io.ebean.Query;
+import io.ebeaninternal.api.SpiQuery;
+
+public class OrmQueryRequestTestHelper {
+
+  static DefaultServer defaultServer = (DefaultServer) DB.getDefault();
+
+  /**
+   * Create and return a OrmQueryRequest for the given query.
+   */
+  public static <T> OrmQueryRequest<T> queryRequest(Query<T> query) {
+    return (OrmQueryRequest<T>) defaultServer.createQueryRequest(SpiQuery.Type.LIST, query, null);
+  }
+
+}

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,14 @@
+package io.ebeaninternal.server.deploy;
+
+import io.ebean.DB;
+import io.ebeaninternal.api.SpiEbeanServer;
+
+public class BaseTest {
+
+  protected SpiEbeanServer server = (SpiEbeanServer)DB.getDefault();
+
+  protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
+    return server.descriptor(cls);
+  }
+
+}

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/org/tests/model/basic/EBasic.java

@@ -0,0 +1,88 @@
+package org.tests.model.basic;
+
+import io.ebean.annotation.EnumValue;
+import io.ebean.annotation.Index;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "e_basic")
+public class EBasic {
+
+  public enum Status {
+    @EnumValue("N")
+    NEW,
+
+    @EnumValue("A")
+    ACTIVE,
+
+    @EnumValue("I")
+    INACTIVE,
+  }
+
+  @Id
+  Integer id;
+
+  Status status;
+
+  @Index
+  @Size(max=127)
+  String name;
+
+  String description;
+
+  Timestamp someDate;
+
+  public EBasic() {
+
+  }
+
+  public EBasic(String name) {
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Timestamp getSomeDate() {
+    return someDate;
+  }
+
+  public void setSomeDate(Timestamp someDate) {
+    this.someDate = someDate;
+  }
+
+}

ebean-core/src/test/java/org/tests/model/embedded/EMain.java

@@ -0,0 +1,52 @@
+package org.tests.model.embedded;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "e_main")
+public class EMain {
+
+  @Id
+  private Integer id;
+
+  private String name;
+
+  @Embedded
+  private Eembeddable embeddable = new Eembeddable();
+
+  @Version
+  private Long version;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Eembeddable getEmbeddable() {
+    return embeddable;
+  }
+
+  public void setEmbeddable(Eembeddable embeddable) {
+    this.embeddable = embeddable;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+}

ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java

@@ -0,0 +1,18 @@
+package org.tests.model.embedded;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class Eembeddable {
+
+  String description;
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+}

ebean-test/src/test/java/io/ebean/xtest/core/DefaultServer_getReferenceTest.java

@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.core;
+package io.ebean.xtest.core;
 
 
 import io.ebean.xtest.BaseTestCase;