Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java
#	ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
#	ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
#	ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java
#	ebean-test/src/test/java/org/tests/json/TestDbJson_List.java
#	ebean-test/src/test/resources/extra-ddl.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
This commit is contained in:
Roland Praml committed 2022-03-24 09:20:28 +01:00
commit 0c6c1abb55
943 files changed
+2654 -1723

No files matched your search

@@ -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;
@@ -1,44 +0,0 @@
package io.ebean;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class PropertyTest {
@Test
public void equals() throws Exception {
assertEquals(prop("foo", true), prop("foo", true));
}
@Test
public void diff_basic() throws Exception {
assertNotEquals(prop("foo", true), prop("bar", true));
assertNotEquals(prop("foo", true), prop("foo", false));
assertNotEquals(prop("foo", false), prop("foo", true));
}
@Test
public void diff_nulls() throws Exception {
assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high"));
assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low"));
assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high"));
assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true));
assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low"));
assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high"));
}
private OrderBy.Property prop(String name, boolean asc) {
return new OrderBy.Property(name, asc, null, null);
}
private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) {
return new OrderBy.Property(name, asc, nulls, highLow);
}
}
@@ -3,10 +3,10 @@ package io.ebean.config;
import io.ebean.Database;
import io.ebean.DatabaseFactory;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.datasource.DataSourceAlert;
import io.ebean.datasource.DataSourceInitialiseException;
import io.ebean.xtest.ForPlatform;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -1,63 +0,0 @@
package io.ebean.config;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class UnderscoreNamingConventionTest {
private UnderscoreNamingConvention namingConvention = new UnderscoreNamingConvention();
@Test
public void simple() {
String col = namingConvention.getColumnFromProperty(null, "helloThere");
assertThat(col).isEqualTo("hello_there");
assertThat(namingConvention.toCamelFromUnderscore(col)).isEqualTo("helloThere");
}
@Test
public void with_suffix_Id() {
String col = namingConvention.getColumnFromProperty(null, "helloId");
assertThat(col).isEqualTo("hello_id");
assertThat(namingConvention.toCamelFromUnderscore(col)).isEqualTo("helloId");
col = namingConvention.getColumnFromProperty(null, "helloThereId");
assertThat(col).isEqualTo("hello_there_id");
assertThat(namingConvention.toCamelFromUnderscore(col)).isEqualTo("helloThereId");
}
@Test
public void with_suffix_ID() {
String col = namingConvention.getColumnFromProperty(null, "helloID");
assertThat(col).isEqualTo("hello_id");
assertThat(namingConvention.toCamelFromUnderscore(col)).isEqualTo("helloId");
col = namingConvention.getColumnFromProperty(null, "helloThereID");
assertThat(col).isEqualTo("hello_there_id");
assertThat(namingConvention.toCamelFromUnderscore(col)).isEqualTo("helloThereId");
}
@Test
public void getColumnFromProperty() {
String fkCol = "bridgetab_user_id";
String col = namingConvention.getColumnFromProperty(null, fkCol);
assertThat(col).isEqualTo(fkCol);
}
@Test
public void getForeignKey() {
String fk = namingConvention.getForeignKey("billing_address", "id");
assertThat(fk).isEqualTo("billing_address_id");
fk = namingConvention.getForeignKey("billing_address", "remoteIdProperty");
assertThat(fk).isEqualTo("billing_address_remote_id_property");
}
}
@@ -1,121 +0,0 @@
package io.ebean.config.dbplatform;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.MatchingNamingConvention;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DatabasePlatformTest extends BaseTestCase {
@Test
@ForPlatform(Platform.H2)
public void h2_platform() {
final Platform platform = DB.getDefault().platform();
assertThat(platform).isSameAs(Platform.H2);
}
@Test
@ForPlatform(Platform.POSTGRES)
public void postgres_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.POSTGRES);
}
@Test
@ForPlatform(Platform.MYSQL)
public void mysql_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.MYSQL);
}
@Test
@ForPlatform(Platform.MARIADB)
public void mariadb_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.MARIADB);
}
@Test
@ForPlatform(Platform.SQLSERVER)
public void sqlserver_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.SQLSERVER);
}
@Test
public void convertQuotedIdentifiers_when_allQuotedIdentifier_sqlServer() {
DatabaseConfig config = new DatabaseConfig();
config.setAllQuotedIdentifiers(true);
config.setNamingConvention(new MatchingNamingConvention());
DatabasePlatform dbPlatform = new SqlServer17Platform();
dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers());
assertEquals(dbPlatform.convertQuotedIdentifiers("order"), "[order]");
assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"), "[order]");
assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"), "[firstName]");
}
@Test
public void convertQuotedIdentifiers() {
DatabaseConfig config = new DatabaseConfig();
DatabasePlatform dbPlatform = new SqlServer17Platform();
dbPlatform.configure(config.getPlatformConfig(), config.isAllQuotedIdentifiers());
assertEquals(dbPlatform.convertQuotedIdentifiers("order"), "order");
assertEquals(dbPlatform.convertQuotedIdentifiers("`order`"), "[order]");
assertEquals(dbPlatform.convertQuotedIdentifiers("firstName"), "firstName");
assertEquals(dbPlatform.unQuote("order"), "order");
assertEquals(dbPlatform.unQuote("[order]"), "order");
assertEquals(dbPlatform.unQuote("[firstName]"), "firstName");
}
@Test
public void defaultTypesForDecimalAndVarchar() {
DatabasePlatform dbPlatform = new DatabasePlatform();
assertEquals(defaultDecimalDefn(dbPlatform), "decimal(16,3)");
assertEquals(defaultDefn(DbType.VARCHAR, dbPlatform), "varchar(255)");
}
@Test
public void configure_customType() {
PlatformConfig config = new PlatformConfig();
config.addCustomMapping(DbType.VARCHAR, "text", Platform.POSTGRES);
config.addCustomMapping(DbType.DECIMAL, "decimal(24,4)");
// PG renders custom decimal and varchar
PostgresPlatform pgPlatform = new PostgresPlatform();
pgPlatform.configure(config, false);
assertEquals(defaultDecimalDefn(pgPlatform), "decimal(24,4)");
assertEquals(defaultDefn(DbType.VARCHAR, pgPlatform), "text");
// H2 only renders custom decimal
H2Platform h2Platform = new H2Platform();
h2Platform.configure(config, false);
assertEquals(defaultDecimalDefn(h2Platform), "decimal(24,4)");
assertEquals(defaultDefn(DbType.VARCHAR, h2Platform), "varchar(255)");
}
private String defaultDecimalDefn(DatabasePlatform dbPlatform) {
return defaultDefn(DbType.DECIMAL, dbPlatform);
}
private String defaultDefn(DbType type, DatabasePlatform dbPlatform) {
return dbPlatform.getDbTypeMap().get(type).renderType(0, 0);
}
}
@@ -1,53 +0,0 @@
package io.ebean.config.dbplatform;
import org.junit.jupiter.api.Test;
import java.sql.Types;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DbPlatformTypeLookupTest {
DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
@Test
public void byName() throws Exception {
assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL);
assertEquals(lookup.byName("Decimal"), DbType.DECIMAL);
assertEquals(lookup.byName("decimal"), DbType.DECIMAL);
assertEquals(lookup.byName("varchar"), DbType.VARCHAR);
assertEquals(lookup.byName("varchar2"), DbType.VARCHAR);
assertEquals(lookup.byName("float"), DbType.REAL);
assertEquals(lookup.byName("real"), DbType.REAL);
assertEquals(lookup.byName("uuid"), DbType.UUID);
assertEquals(lookup.byName("hstore"), DbType.HSTORE);
assertEquals(lookup.byName("json"), DbType.JSON);
assertEquals(lookup.byName("jsonb"), DbType.JSONB);
assertEquals(lookup.byName("jsonclob"), DbType.JSONCLOB);
assertEquals(lookup.byName("jsonblob"), DbType.JSONBLOB);
assertEquals(lookup.byName("jsonVarchar"), DbType.JSONVARCHAR);
}
@Test
public void byId() throws Exception {
assertEquals(lookup.byId(Types.ARRAY), DbType.ARRAY);
assertEquals(lookup.byId(Types.BIGINT), DbType.BIGINT);
assertEquals(lookup.byId(ExtraDbTypes.UUID), DbType.UUID);
assertEquals(lookup.byId(ExtraDbTypes.HSTORE), DbType.HSTORE);
assertEquals(lookup.byId(ExtraDbTypes.JSON), DbType.JSON);
assertEquals(lookup.byId(ExtraDbTypes.JSONB), DbType.JSONB);
assertEquals(lookup.byId(ExtraDbTypes.JSONClob), DbType.JSONCLOB);
assertEquals(lookup.byId(ExtraDbTypes.JSONBlob), DbType.JSONBLOB);
assertEquals(lookup.byId(ExtraDbTypes.JSONVarchar), DbType.JSONVARCHAR);
}
}
@@ -1,67 +0,0 @@
package io.ebean.config.dbplatform;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DbPlatformTypeParserTest {
@Test
public void parse_text() throws Exception {
DbPlatformType type = DbPlatformTypeParser.parse("text");
assertEquals(type.getName(), "text");
assertEquals(type.getDefaultLength(), 0);
assertEquals(type.getDefaultScale(), 0);
assertEquals(type.renderType(0, 0), "text");
assertEquals(type.renderType(40, 0), "text");
}
@Test
public void parse_varchar20() throws Exception {
DbPlatformType type = DbPlatformTypeParser.parse("varchar(20)");
assertEquals(type.getName(), "varchar");
assertEquals(type.getDefaultLength(), 20);
assertEquals(type.getDefaultScale(), 0);
assertEquals(type.renderType(0, 0), "varchar(20)");
assertEquals(type.renderType(40, 0), "varchar(40)");
}
@Test
public void parse_decimal_18_6() throws Exception {
DbPlatformType type = DbPlatformTypeParser.parse("decimal(18,6)");
assertEquals(type.getName(), "decimal");
assertEquals(type.getDefaultLength(), 18);
assertEquals(type.getDefaultScale(), 6);
assertEquals(type.renderType(0, 0), "decimal(18,6)");
}
@Test
public void parse_something() throws Exception {
DbPlatformType type = DbPlatformTypeParser.parse("something(asd,6)");
assertEquals(type.getName(), "something(asd,6)");
assertEquals(type.getDefaultLength(), 0);
assertEquals(type.getDefaultScale(), 0);
assertEquals(type.renderType(0, 0), "something(asd,6)");
}
@Test
public void parse_invalid() throws Exception {
DbPlatformType type = DbPlatformTypeParser.parse("something(asd");
assertEquals(type.getName(), "something(asd");
assertEquals(type.getDefaultLength(), 0);
assertEquals(type.getDefaultScale(), 0);
assertEquals(type.renderType(0, 0), "something(asd");
}
}
@@ -1,34 +0,0 @@
package io.ebean.config.dbplatform;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class MySqlPlatformTest {
@Test
public void uuid_default() {
MySqlPlatform platform = new MySqlPlatform();
platform.configure(new PlatformConfig(), false);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
}
@Test
public void uuid_as_binary() {
MySqlPlatform platform = new MySqlPlatform();
PlatformConfig config = new PlatformConfig();
config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
platform.configure(config, false);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
}
}
@@ -1,50 +0,0 @@
package io.ebean.config.dbplatform;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.oracle.Oracle11Platform;
import io.ebean.config.dbplatform.oracle.Oracle12Platform;
import io.ebean.config.dbplatform.oracle.OraclePlatform;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class OraclePlatformTest {
@Test
void columnAliasPrefix_Oracle11Platform() {
Oracle11Platform platform11 = new Oracle11Platform();
assertThat(platform11.columnAliasPrefix).isEqualTo("c");
}
@Test
void columnAliasPrefix_Oracle12Platform() {
Oracle12Platform platform12 = new Oracle12Platform();
assertThat(platform12.columnAliasPrefix).isEqualTo("c");
}
@Test
void columnAliasPrefix_OraclePlatform() {
OraclePlatform platform = new OraclePlatform();
assertThat(platform.columnAliasPrefix).isNull();
}
@Test
void uuid_default() {
OraclePlatform platform = new OraclePlatform();
platform.configure(new PlatformConfig(), false);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("varchar2(40)");
}
@Test
void uuid_as_binary() {
OraclePlatform platform = new OraclePlatform();
PlatformConfig config = new PlatformConfig();
config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
platform.configure(config, false);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("raw(16)");
}
}
@@ -1,68 +0,0 @@
package io.ebean.config.dbplatform;
import io.ebean.Query;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class PostgresPlatformTest {
@Test
public void testUuidType() {
PostgresPlatform platform = new PostgresPlatform();
platform.configure(new PlatformConfig(), false);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
String columnDefn = dbType.renderType(0, 0);
assertThat(columnDefn).isEqualTo("uuid");
}
@Test
public void default_forUpdate_expect_noKeyUsed() {
DatabasePlatform platform = new PostgresPlatform();
PlatformConfig config = new PlatformConfig();
platform.configure(config);
assertThat(config.isForUpdateNoKey()).isFalse();
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for update skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for update nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for update");
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.UPDATE)).isEqualTo("X for update skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.SHARE)).isEqualTo("X for share skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.KEY_SHARE)).isEqualTo("X for key share skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.UPDATE)).isEqualTo("X for update nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.SHARE)).isEqualTo("X for share nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.UPDATE)).isEqualTo("X for update");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.SHARE)).isEqualTo("X for share");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share");
}
@Test
public void lockWithKey_forUpdate() {
DatabasePlatform platform = new PostgresPlatform();
PlatformConfig config = new PlatformConfig();
config.setForUpdateNoKey(true);
platform.configure(config);
assertThat(config.isForUpdateNoKey()).isTrue();
assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for no key update skip locked");
assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update nowait");
assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update");
}
}
@@ -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;
@@ -1,230 +0,0 @@
package io.ebean.text;
import io.ebean.BaseTestCase;
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;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
public class PathPropertiesTests extends BaseTestCase {
private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class);
@Test
public void test_noParentheses() {
PathProperties s0 = PathProperties.parse("id,name");
assertEquals(1, s0.getPathProps().size());
assertTrue(s0.getProperties(null).contains("id"));
assertTrue(s0.getProperties(null).contains("name"));
assertFalse(s0.getProperties(null).contains("status"));
}
@Test
public void test_noParentheses_needTrim() {
PathProperties s0 = PathProperties.parse(" id, name ");
assertEquals(1, s0.getPathProps().size());
assertTrue(s0.getProperties(null).contains("id"));
assertTrue(s0.getProperties(null).contains("name"));
assertFalse(s0.getProperties(null).contains("status"));
}
@Test
public void test_withParentheses() {
PathProperties s0 = PathProperties.parse("(id,name)");
assertEquals(1, s0.getPathProps().size());
assertTrue(s0.getProperties(null).contains("id"));
assertTrue(s0.getProperties(null).contains("name"));
assertFalse(s0.getProperties(null).contains("status"));
}
@Test
public void test_withColon() {
PathProperties s0 = PathProperties.parse(":(id,name)");
assertEquals(1, s0.getPathProps().size());
assertTrue(s0.getProperties(null).contains("id"));
assertTrue(s0.getProperties(null).contains("name"));
assertFalse(s0.getProperties(null).contains("status"));
}
@Test
public void test_nested() {
PathProperties s1 = PathProperties.parse("id,name,shipAddr(*)");
assertEquals(2, s1.getPathProps().size());
assertEquals(3, s1.getProperties(null).size());
assertTrue(s1.getProperties(null).contains("id"));
assertTrue(s1.getProperties(null).contains("name"));
assertTrue(s1.getProperties(null).contains("shipAddr"));
assertTrue(s1.getProperties("shipAddr").contains("*"));
assertEquals(1, s1.getProperties("shipAddr").size());
}
@Test
public void test_withParenthesesColonNested() {
PathProperties s1 = PathProperties.parse(":(id,name,shipAddr(*))");
assertEquals(2, s1.getPathProps().size());
assertEquals(3, s1.getProperties(null).size());
assertTrue(s1.getProperties(null).contains("id"));
assertTrue(s1.getProperties(null).contains("name"));
assertTrue(s1.getProperties(null).contains("shipAddr"));
assertTrue(s1.getProperties("shipAddr").contains("*"));
assertEquals(1, s1.getProperties("shipAddr").size());
}
@Test
public void test_add() {
PathProperties root = PathProperties.parse("status,date");
root.addNested("customer", PathProperties.parse("id,name"));
FetchPath expect = PathProperties.parse("status,date,customer(id,name)");
assertThat(root.toString()).isEqualTo(expect.toString());
}
@Test
public void test_add_nested() {
PathProperties root = PathProperties.parse("status,date");
root.addNested("customer", PathProperties.parse("id,name,address(line1,city)"));
FetchPath expect = PathProperties.parse("status,date,customer(id,name,address(line1,city))");
assertThat(root.toString()).isEqualTo(expect.toString());
}
@Test
public void test_all_properties() {
FetchPath root = PathProperties.parse("*");
assertThat(root.getProperties(null)).containsExactly("*");
}
@Test
public void test_all_properties_multipleLevels() {
PathProperties root = PathProperties.parse("*,customer(*)");
//PathProperties.Props rootProps = root.getProps(null);
PathProperties.Props customerProps = root.getProps("customer");
assertThat(root.getProperties(null)).containsExactly("*", "customer");
assertThat(customerProps.getPropertiesAsString()).isEqualTo("*");
}
@Test
public void test_includesProperty_when_wildcardUsed() {
PathProperties root = PathProperties.parse("*,customer(*)");
assertTrue(root.includesProperty("id"));
assertTrue(root.includesProperty("name"));
assertTrue(root.includesProperty("customer.id"));
assertTrue(root.includesProperty("customer.name"));
assertFalse(root.includesProperty("details.id"));
assertTrue(root.includesProperty("details"));
assertFalse(root.includesPath("details"));
}
@Test
public void test_includesProperty_when_specificPropertiesUsed() {
PathProperties root = PathProperties.parse("id,name,customer(*,billingAddress(city))");
assertTrue(root.includesProperty("id"));
assertTrue(root.includesProperty("name"));
assertFalse(root.includesProperty("status"));
assertTrue(root.includesProperty("customer.id"));
assertTrue(root.includesProperty("customer.foo"));
assertTrue(root.includesProperty("customer.billingAddress"));
assertTrue(root.includesProperty("customer.billingAddress.city"));
assertFalse(root.includesPath("customer.shippingAddress"));
assertFalse(root.includesPath("customer", "shippingAddress"));
assertFalse(root.includesProperty("customer.shippingAddress.city"));
assertTrue(root.includesPath(null));
assertTrue(root.includesPath("customer"));
assertTrue(root.includesPath("customer.billingAddress"));
assertTrue(root.includesPath("customer", "billingAddress"));
assertFalse(root.includesPath("customer.shippingAddress"));
assertFalse(root.includesPath("details"));
}
@Test
public void test_includesPropertyWithPrefix() {
PathProperties root = PathProperties.parse("id,name,customer(*,billingAddress(city))");
assertTrue(root.includesProperty("customer", "id"));
assertTrue(root.includesProperty("customer", "billingAddress"));
assertTrue(root.includesProperty("customer.billingAddress", "city"));
assertFalse(root.includesPath("customer", "shippingAddress"));
assertFalse(root.includesProperty("customer.shippingAddress", "city"));
}
@Test
public void test_includesPathWithPrefix() {
PathProperties root = PathProperties.parse("id,name,customer(*,billingAddress(city))");
assertTrue(root.includesPath(null, "customer"));
assertTrue(root.includesPath("customer", "billingAddress"));
assertFalse(root.includesPath(null, "details"));
assertFalse(root.includesPath("customer", "shippingAddress"));
}
@Test
public void example_withQueryAndJson() {
ResetBasicData.reset();
PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))");
Query<Customer> query = DB.find(Customer.class)
.where().lt("id", 2)
.query();
pathProps.apply(query);
List<Customer> list = query.findList();
String asJson = DB.json().toJson(list, pathProps);
log.info("Json: {}", asJson);
}
@Test
public void test_withAllPropsQuery() {
PathProperties root = PathProperties.parse("*,billingAddress(line1)");
LoggedSql.start();
Query<Customer> query = DB.find(Customer.class).apply(root);
query.findList();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;");
}
}
@@ -1,46 +0,0 @@
package io.ebean.util;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CamelCaseHelperTest {
@Test
public void when_underscore() {
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there"), "helloThere");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there_jim"), "helloThereJim");
}
@Test
public void when_trailing_numbers() {
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_1"), "hello1");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there_2"), "helloThere2");
}
@Test
public void when_numbers() {
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1_id"), "hello1Id");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2_foo"), "helloThere2Foo");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1id"), "hello1id");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2foo"), "helloThere2foo");
}
@Test
public void when_numbersProceedUppercase() {
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello1_id"), "hello1Id");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello_there2_foo"), "helloThere2Foo");
assertEquals(CamelCaseHelper.toUnderscoreFromCamel("hello1Id"), "hello1_id");
assertEquals(CamelCaseHelper.toUnderscoreFromCamel("helloThere2Foo"), "hello_there2_foo");
}
@Test
public void when_already_camel() {
assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThere"), "helloThere");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("helloThereJim"), "helloThereJim");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("hello"), "hello");
assertEquals(CamelCaseHelper.toCamelFromUnderscore("HELLO"), "hello");
}
}
@@ -1,29 +0,0 @@
package io.ebean.util;
import org.junit.jupiter.api.Test;
import static io.ebean.util.EncodeB64.enc;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestEncodeB64 {
@Test
public void test() {
assertEquals("A", enc(0));
assertEquals("B", enc(1));
assertEquals("Z", enc(25));
assertEquals("a", enc(26));
assertEquals("z", enc(51));
assertEquals("0", enc(52));
assertEquals("9", enc(61));
assertEquals("-", enc(62));
assertEquals("_", enc(63));
assertEquals("BA", enc(64));
assertEquals("Bk", enc(100));
assertEquals("B9", enc(125));
assertEquals("B-", enc(126));
assertEquals("B_", enc(127));
assertEquals("CA", enc(128));
}
}
@@ -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;
@@ -7,6 +8,7 @@ import io.ebean.config.dbplatform.IdType;
import io.ebean.meta.MetaTimedMetric;
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;
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
package io.ebean.server.type;
package io.ebean.xtest;
import io.ebean.annotation.EnumValue;
@@ -1,4 +1,4 @@
package io.ebean.server.type;
package io.ebean.xtest;
import io.ebean.annotation.EnumValue;
@@ -1,4 +1,4 @@
package io.ebean.server.type;
package io.ebean.xtest;
public enum MySex {
MALE, FEMALE
@@ -1,4 +1,4 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebeaninternal.server.rawsql.SpiRawSql;
@@ -1,5 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DtoQuery;
import io.ebean.QueryIterator;
import io.ebean.meta.BasicMetricVisitor;
import io.ebean.meta.MetaQueryMetric;
import io.ebean.test.LoggedSql;
@@ -1,6 +1,10 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.annotation.ForPlatform;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.DtoQuery;
import io.ebean.ProfileLocation;
import io.ebean.xtest.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.meta.MetaQueryMetric;
import io.ebean.meta.MetaTimedMetric;
@@ -1,6 +1,10 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.annotation.ForPlatform;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.DtoQuery;
import io.ebean.SqlRow;
import io.ebean.xtest.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.meta.BasicMetricVisitor;
import io.ebean.meta.MetaQueryMetric;
@@ -1,5 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.Database;
import io.ebean.DatabaseFactory;
import io.ebean.config.*;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
import io.ebean.config.dbplatform.postgres.PostgresPlatform;
@@ -1,5 +1,7 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.Database;
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
import io.ebean.event.ServerConfigStartup;
import org.junit.jupiter.api.Test;
@@ -1,5 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Transaction;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -1,5 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Transaction;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -1,5 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Transaction;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -9,7 +13,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
public class EbeanServer_deleteTest extends BaseTestCase {
public class EbeanServer_deleteTest extends BaseTestCase {
@Test
public void delete() {
@@ -1,5 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
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;
@@ -1,5 +1,7 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.DB;
import io.ebean.Database;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasic;
import org.tests.model.basic.Order;
@@ -1,5 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.Transaction;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -1,5 +1,7 @@
package io.ebean;
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;
@@ -1,5 +1,6 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.FetchConfig;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,5 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.FetchGroup;
import io.ebean.Query;
import io.ebean.service.SpiFetchGroupQuery;
import io.ebean.test.LoggedSql;
import org.junit.jupiter.api.Test;
@@ -1,4 +1,4 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.config.CurrentUserProvider;
@@ -1,7 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.DB;
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;
@@ -0,0 +1,44 @@
package io.ebean.xtest.base;
import io.ebean.OrderBy;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class PropertyTest {
@Test
public void equals() throws Exception {
Assertions.assertEquals(prop("foo", true), prop("foo", true));
}
@Test
public void diff_basic() throws Exception {
Assertions.assertNotEquals(prop("foo", true), prop("bar", true));
Assertions.assertNotEquals(prop("foo", true), prop("foo", false));
Assertions.assertNotEquals(prop("foo", false), prop("foo", true));
}
@Test
public void diff_nulls() throws Exception {
Assertions.assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high"));
Assertions.assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low"));
Assertions.assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high"));
Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true));
Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low"));
Assertions.assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high"));
}
private OrderBy.Property prop(String name, boolean asc) {
return new OrderBy.Property(name, asc, null, null);
}
private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) {
return new OrderBy.Property(name, asc, nulls, highLow);
}
}
@@ -1,5 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.SqlQuery;
import io.ebean.SqlRow;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,4 +1,4 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.util.StringHelper;
import org.junit.jupiter.api.Test;
@@ -1,5 +1,7 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.ValuePair;
import io.ebean.bean.EntityBean;
import io.ebean.bean.EntityBeanIntercept;
import io.ebeaninternal.server.core.DefaultBeanState;
@@ -1,5 +1,8 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Filter;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
@@ -1,6 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.xtest.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.DB;
import io.ebean.xtest.IgnorePlatform;
import io.ebean.annotation.Platform;
import io.ebean.bean.EntityBean;
import io.ebean.test.LoggedSql;
@@ -1,6 +1,7 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.DB;
import io.ebean.search.Match;
import io.ebean.search.MultiMatch;
import org.junit.jupiter.api.Test;
@@ -1,5 +1,7 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.tests.model.basic.ResetBasicData;
@@ -1,5 +1,6 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.TxScope;
import io.ebean.annotation.PersistBatch;
import org.junit.jupiter.api.Test;
@@ -1,7 +1,9 @@
package io.ebean;
package io.ebean.xtest.base;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.*;
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;
@@ -1,7 +1,9 @@
package io.ebean.bean;
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;
import org.junit.jupiter.api.Test;
import org.tests.compositekeys.db.AuditInfo;
import org.tests.model.basic.Customer;
@@ -1,5 +1,6 @@
package io.ebean.cache;
package io.ebean.xtest.cache;
import io.ebean.cache.TenantAwareKey;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,6 +1,8 @@
package io.ebean.cache;
package io.ebean.xtest.cache;
import io.ebean.DB;
import io.ebean.cache.ServerCacheManager;
import io.ebean.cache.ServerCacheRegion;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,5 +1,6 @@
package io.ebean.cache;
package io.ebean.xtest.cache;
import io.ebean.cache.ServerCacheOptions;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,6 +1,7 @@
package io.ebean.common;
package io.ebean.xtest.common;
import io.ebean.bean.BeanCollection;
import io.ebean.common.BeanList;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -1,6 +1,7 @@
package io.ebean.common;
package io.ebean.xtest.common;
import io.ebean.bean.BeanCollection;
import io.ebean.common.BeanMap;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasic;
@@ -1,6 +1,7 @@
package io.ebean.common;
package io.ebean.xtest.common;
import io.ebean.bean.BeanCollection;
import io.ebean.common.BeanSet;
import org.junit.jupiter.api.Test;
import java.util.LinkedHashSet;
@@ -1,5 +1,6 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.config.ContainerConfig;
import org.junit.jupiter.api.Test;
import java.util.Properties;
@@ -1,10 +1,15 @@
package io.ebean.config;
package io.ebean.xtest.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.ebean.annotation.MutationDetection;
import io.ebean.annotation.PersistBatch;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.JsonConfig;
import io.ebean.config.MatchingNamingConvention;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.IdType;
import io.ebean.datasource.DataSourceConfig;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Properties;
@@ -105,8 +110,8 @@ public class DatabaseConfigTest {
assertEquals(IdType.SEQUENCE, config.getIdType());
assertEquals(PersistBatch.ALL, config.getPersistBatch());
assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid());
assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime());
Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid());
Assertions.assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime());
assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate());
assertEquals("r0,users,orgs", config.getEnabledL2Regions());
@@ -1,5 +1,6 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.config.DbConstraintNaming;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,5 +1,6 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.config.DatabaseConfig;
import io.ebean.migration.MigrationConfig;
import org.junit.jupiter.api.Test;
@@ -1,6 +1,8 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.annotation.DocStoreMode;
import io.ebean.config.DocStoreConfig;
import io.ebean.config.PropertiesWrapper;
import org.junit.jupiter.api.Test;
import java.util.Properties;
@@ -1,5 +1,8 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.config.MatchingNamingConvention;
import io.ebean.config.PlatformConfig;
import io.ebean.config.TableName;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
import org.junit.jupiter.api.Test;
@@ -1,9 +1,10 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.ebean.Database;
import io.ebean.DatabaseFactory;
import io.ebean.Transaction;
import io.ebean.annotation.Platform;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.DbIdentity;
import io.ebean.config.dbplatform.IdType;
import io.ebean.config.dbplatform.h2.H2Platform;
@@ -1,7 +1,8 @@
package io.ebean.config;
package io.ebean.xtest.config;
import io.avaje.config.Config;
import io.ebean.annotation.Platform;
import io.ebean.config.PropertiesWrapper;
import org.junit.jupiter.api.Test;
import java.util.Properties;
@@ -1,10 +1,11 @@
package io.ebean.config;
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;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
@@ -1,6 +1,7 @@
package io.ebean.config;
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;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,5 +1,6 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.BasicSqlLimitOffset;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -1,5 +1,6 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.BasicSqlAnsiLimiter;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -0,0 +1,48 @@
package io.ebean.xtest.config.dbplatform;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.xtest.ForPlatform;
import io.ebean.annotation.Platform;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
class DatabasePlatformBaseTest extends BaseTestCase {
@Test
@ForPlatform(Platform.H2)
public void h2_platform() {
final Platform platform = DB.getDefault().platform();
assertThat(platform).isSameAs(Platform.H2);
}
@Test
@ForPlatform(Platform.POSTGRES)
public void postgres_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.POSTGRES);
}
@Test
@ForPlatform(Platform.MYSQL)
public void mysql_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.MYSQL);
}
@Test
@ForPlatform(Platform.MARIADB)
public void mariadb_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.MARIADB);
}
@Test
@ForPlatform(Platform.SQLSERVER)
public void sqlserver_platform() {
final Platform platform = DB.getDefault().platform().base();
assertThat(platform).isSameAs(Platform.SQLSERVER);
}
}
@@ -1,5 +1,6 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.DbIdentity;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -1,5 +1,7 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.DbPlatformTypeMapping;
import org.junit.jupiter.api.Test;
import java.sql.Types;
@@ -1,5 +1,7 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.DbPlatformTypeMapping;
import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
@@ -1,4 +1,4 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.hana.HanaHistorySupport;
import org.junit.jupiter.api.Test;
@@ -1,6 +1,7 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.hana.HanaPlatform;
import org.junit.jupiter.api.Test;
@@ -1,4 +1,4 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.mysql.MySqlHistorySupport;
@@ -1,4 +1,4 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.postgres.PostgresHistorySupport;
import org.junit.jupiter.api.Test;
@@ -1,12 +1,13 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.dbplatform.SequenceIdGenerator;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import java.sql.ResultSet;
import java.util.List;
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
public class SequenceBatchIdGeneratorTest {
@@ -20,12 +21,12 @@ public class SequenceBatchIdGeneratorTest {
generator.add(asList(5L, 6L));
generator.add(asList(3L, 4L));
assertThat(generator.nextId(null)).isEqualTo(1L);
assertThat(generator.nextId(null)).isEqualTo(2L);
assertThat(generator.nextId(null)).isEqualTo(3L);
assertThat(generator.nextId(null)).isEqualTo(4L);
assertThat(generator.nextId(null)).isEqualTo(5L);
assertThat(generator.nextId(null)).isEqualTo(6L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(1L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(2L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(3L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(4L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(5L);
Assertions.assertThat(generator.nextId(null)).isEqualTo(6L);
}
private class TD extends SequenceIdGenerator {
@@ -1,6 +1,7 @@
package io.ebean.config.dbplatform;
package io.ebean.xtest.config.dbplatform;
import io.ebean.config.PlatformConfig;
import io.ebean.config.dbplatform.DbPlatformType;
import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
import org.junit.jupiter.api.Test;
@@ -1,5 +1,7 @@
package io.ebean.config.dbplatform.sqlserver;
package io.ebean.xtest.config.dbplatform.sqlserver;
import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
import io.ebean.config.dbplatform.sqlserver.SqlServerHistorySupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -1,9 +1,10 @@
package io.ebean.config.dbplatform.sqlserver;
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;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -1,7 +1,7 @@
package io.ebeanservice.docstore.api.support;
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;
@@ -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");
assertThat(adapter.indexType()).isEqualTo("order");
assertThat(adapter.getQueueId()).isEqualTo("order");
Assertions.assertThat(adapter.indexName()).isEqualTo("order");
Assertions.assertThat(adapter.indexType()).isEqualTo("order");
Assertions.assertThat(adapter.getQueueId()).isEqualTo("order");
}
static class TDAdapter<T> extends DocStoreBeanBaseAdapter<T> {
@@ -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;
@@ -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;
@@ -1,11 +1,13 @@
package io.ebean.event;
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;
import io.ebean.common.BeanList;
import io.ebean.config.DatabaseConfig;
import io.ebean.event.BeanFindController;
import io.ebean.event.BeanQueryRequest;
import org.junit.jupiter.api.Test;
import org.tests.example.ModUuidGenerator;
import org.tests.model.basic.EBasic;
@@ -18,10 +20,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.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
public class BeanFindControllerTest extends BaseTestCase {
@@ -1,10 +1,13 @@
package io.ebean.event;
package io.ebean.xtest.event;
import io.ebean.Database;
import io.ebean.DatabaseFactory;
import io.ebean.Transaction;
import io.ebean.config.DatabaseConfig;
import io.ebean.event.BeanDeleteIdRequest;
import io.ebean.event.BeanPersistAdapter;
import io.ebean.event.BeanPersistRequest;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.EBasicVer;
import org.tests.model.basic.UTDetail;
@@ -1,8 +1,10 @@
package io.ebean.event;
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;
@@ -1,6 +1,7 @@
package io.ebean.event.readaudit;
package io.ebean.xtest.event.readaudit;
import io.ebean.event.readaudit.ReadAuditQueryPlan;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -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;
@@ -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;
@@ -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 ,"));
@@ -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;
@@ -1,4 +1,4 @@
package io.ebeaninternal.api;
package io.ebean.xtest.internal.api;
import io.avaje.lang.NonNullApi;
import io.ebean.*;
@@ -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;
@@ -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.xtest.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;
@@ -1,7 +1,7 @@
package io.ebeaninternal.server.executor;
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;
@@ -1,13 +1,14 @@
package io.ebeaninternal.server.grammer;
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;
import io.ebeaninternal.server.grammer.EqlParser;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.OrderDetail;
@@ -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.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.*;
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.assertThatThrownBy;
import static org.assertj.core.api.Assertions.within;
import static org.assertj.core.api.Assertions.*;
/**
* Run some simple tests for the UUID generator.
@@ -1,6 +1,6 @@
package io.ebeaninternal.server.lib;
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;
@@ -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;
@@ -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");
@@ -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;
@@ -1,85 +1,85 @@
package io.ebeaninternal.server.query;
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;
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);
}
Loaded 100 of 943 files, more files were not shown because too many files have changed in this diff. Show more