Refactor tests, move BaseTestCase and annotations @ForPlatform @IgnorePlatform

ebean-test/src/test/java/io/ebean/DbPrimaryTest.java

@@ -1,6 +1,7 @@
 package io.ebean;
 
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/io/ebean/test/DbJsonTest.java

@@ -1,7 +1,7 @@
 package io.ebean.test;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.etest.BSimpleFor;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java

@@ -1,5 +1,6 @@
-package io.ebean;
+package io.ebean.xtest;
 
+import io.ebean.*;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.cache.ServerCacheStatistics;

ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java

@@ -1,4 +1,6 @@
-package io.ebean.annotation;
+package io.ebean.xtest;
+
+import io.ebean.annotation.Platform;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java

@@ -1,4 +1,6 @@
-package io.ebean.annotation;
+package io.ebean.xtest;
+
+import io.ebean.annotation.Platform;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DtoQuery;
 import io.ebean.QueryIterator;
 import io.ebean.meta.BasicMetricVisitor;

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java

@@ -1,10 +1,10 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DtoQuery;
 import io.ebean.ProfileLocation;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java

@@ -1,10 +1,10 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DtoQuery;
 import io.ebean.SqlRow;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.*;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Transaction;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Transaction;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Transaction;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Transaction;

ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java

@@ -1,6 +1,7 @@
 package io.ebean.xtest.base;
 
 import io.ebean.*;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.FetchGroup;
 import io.ebean.Query;
 import io.ebean.service.SpiFetchGroupQuery;

ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java

@@ -1,8 +1,8 @@
 package io.ebean.xtest.base;
 
 import io.ebean.DB;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.ForPlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;

ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;

ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;

ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Filter;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java

@@ -1,9 +1,9 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.base;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java

@@ -1,8 +1,9 @@
 package io.ebean.xtest.base;
 
 import io.ebean.*;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.ServerMetrics;

ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.bean;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;

ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java

@@ -3,7 +3,7 @@ package io.ebean.xtest.config;
 
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import org.junit.jupiter.api.Disabled;

ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.config;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.config.TableName;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java

@@ -1,8 +1,8 @@
 package io.ebean.xtest.config.dbplatform;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java

@@ -1,8 +1,8 @@
 package io.ebean.xtest.config.dbplatform.sqlserver;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.BaseTestCase;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServerStepSequence;
 import org.junit.jupiter.api.Disabled;

ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java

@@ -1,7 +1,7 @@
 package io.ebean.xtest.docstore;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.Query;
 import io.ebean.docstore.DocUpdateContext;
 import io.ebeaninternal.api.SpiEbeanServer;

ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.event;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.bean.BeanCollection;

ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java

@@ -4,6 +4,7 @@ package io.ebean.xtest.event;
 import io.ebean.*;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.event.BeanPostLoad;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 

ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.cluster.binarymessage;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.xtest.internal.api.TDSpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;

ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java

@@ -1,7 +1,7 @@
 package io.ebean.xtest.internal.server.executor;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import org.junit.jupiter.api.Disabled;

ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java

@@ -1,10 +1,10 @@
 package io.ebean.xtest.internal.server.grammer;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.ForPlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import io.ebeaninternal.api.SpiQuery;

ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.lib;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DatabaseFactory;
 import io.ebean.event.ShutdownManager;

ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.query;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.query.LimitOffsetPagedList;

ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java

@@ -1,6 +1,7 @@
 package io.ebean.xtest.internal.server.query;
 
 import io.ebean.*;
+import io.ebean.xtest.BaseTestCase;
 import io.ebeaninternal.server.query.QueryFutureIds;
 import io.ebeaninternal.server.query.QueryFutureList;
 import io.ebeaninternal.server.query.QueryFutureRowCount;

ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java

@@ -1,7 +1,8 @@
 package io.ebean.xtest.internal.server.rawsql;
 
 import io.ebean.*;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebeaninternal.server.core.DefaultServer;

ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java

@@ -1,7 +1,8 @@
 package io.ebean.xtest.internal.server.rawsql;
 
 import io.ebean.*;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;

ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.text.json;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.text.json.JsonContext;
 import io.ebean.text.json.JsonWriteBeanVisitor;

ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.text.json;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.text.json.JsonContext;
 import io.ebean.text.json.JsonReadBeanVisitor;

ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java

@@ -1,7 +1,8 @@
 package io.ebean.xtest.internal.server.transaction;
 
 import io.ebean.*;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiTransaction;

ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.transaction;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.TxScope;

ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.internal.server.transaction;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import org.junit.jupiter.api.AfterEach;

ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java

@@ -1,7 +1,7 @@
 package io.ebean.xtest.json;
 
 import com.fasterxml.jackson.core.JsonParser;
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.text.json.JsonBeanReader;

ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.plugin;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.plugin.BeanType;

ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java

@@ -1,6 +1,6 @@
 package io.ebean.xtest.text;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java

@@ -1,7 +1,8 @@
 package io.ebeaninternal.dbmigration;
 
 import io.ebean.*;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DbHistorySupport;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiEbeanServer;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cache;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.changelog;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.changelog;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.event.changelog.ChangeSet;

ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.changelog;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.event.changelog.ChangeLogFilter;
 import org.junit.jupiter.api.Test;
 import org.tests.inheritance.model.ProductConfiguration;

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.FetchConfig;
 import io.ebean.Query;

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Car;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.Property;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+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;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.jupiter.api.Test;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
-import io.ebean.annotation.ForPlatform;
+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;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;

ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;

ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.expression;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebeaninternal.api.SpiExpression;

ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.loadcontext;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.FetchConfig;
 import io.ebean.Query;
 import io.ebeaninternal.server.core.OrmQueryRequest;

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.querydefn;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.DB;
 import io.ebeaninternal.api.BindValuesKey;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.querydefn;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlRow;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.config.EncryptKey;
 import org.junit.jupiter.api.Test;
 import org.tests.basic.encrypt.BasicEncryptKey;

ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.core.type.DataReader;

ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java

@@ -1,8 +1,8 @@
 package org.etest;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;

ebean-test/src/test/java/org/etest/ForTestsTest.java

@@ -1,9 +1,9 @@
 package org.etest;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.ForTests;

ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java

@@ -1,6 +1,6 @@
 package org.multitenant.partition;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;

ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java

@@ -1,8 +1,8 @@
 package org.tests.aggregateformula;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java

@@ -1,6 +1,6 @@
 package org.tests.aggregateformula;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.annotation.Index;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Where;

ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.cache.ServerCache;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java

@@ -1,8 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EDefaultProp;

ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Article;

ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PFile;

ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PersistentFile;

ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PFile;

ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TMapSuperEntity;

ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import io.ebean.Database;

ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestFetchId.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.FutureIds;
 import io.ebean.Query;