From b85bb5f459e9ce8dcf650119716cf387b92e5c3f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 27 Mar 2022 20:31:17 +1300 Subject: [PATCH] Refactor tests, move some unit tests to ebean-api --- .../ebean/config/UnderscoreNamingConventionTest.java | 0 .../config/dbplatform/DatabasePlatformTest.java | 0 .../config/dbplatform/DbPlatformTypeLookupTest.java | 0 .../config/dbplatform/DbPlatformTypeParserTest.java | 0 .../ebean/config/dbplatform/MySqlPlatformTest.java | 0 .../ebean/config/dbplatform/OraclePlatformTest.java | 0 .../config/dbplatform/PostgresPlatformTest.java | 0 .../test/java/io/ebean/util/CamelCaseHelperTest.java | 0 .../src/test/java/io/ebean/util/TestEncodeB64.java | 0 .../src/test/java/io/ebean/xtest/BaseTestCase.java | 12 ++++-------- 10 files changed, 4 insertions(+), 8 deletions(-) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/util/CamelCaseHelperTest.java (100%) rename {ebean-core => ebean-api}/src/test/java/io/ebean/util/TestEncodeB64.java (100%) diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-api/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java rename to ebean-api/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-api/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java rename to ebean-api/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-api/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java rename to ebean-api/src/test/java/io/ebean/util/CamelCaseHelperTest.java diff --git a/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java b/ebean-api/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java rename to ebean-api/src/test/java/io/ebean/util/TestEncodeB64.java diff --git a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java index 059cdae68..880946f7f 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java @@ -1,6 +1,9 @@ package io.ebean.xtest; -import io.ebean.*; +import io.ebean.CacheMode; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Query; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.cache.ServerCacheStatistics; @@ -10,10 +13,7 @@ import io.ebean.meta.ServerMetrics; import io.ebean.util.StringHelper; import io.ebean.xtest.base.PlatformCondition; import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiTransaction; -import io.ebeaninternal.server.core.HelpCreateQueryRequest; -import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory; @@ -325,8 +325,4 @@ public abstract class BaseTestCase { DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform()); return dbExpressionHandler.concat(property0, separator, property1, suffix); } - - protected OrmQueryRequest createQueryRequest(SpiQuery.Type type, Query query, Transaction t) { - return HelpCreateQueryRequest.create(server(), type, query, t); - } }