github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2357 - Update tests to move away from deprecated methods

Browse Source
This commit is contained in:
rbygrave
2021-09-07 21:44:07 +12:00
parent e95442d8ec
commit 66143280fa
19 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
+3 -8
View File
@@ -1,7 +1,6 @@
package io.ebeaninternal.server.cluster.binarymessage;
import io.ebean.BaseTestCase;
import io.ebean.Database;
import io.ebean.EbeanServer;
import io.ebeaninternal.api.TDSpiEbeanServer;
import io.ebeaninternal.api.TransactionEventTable;
@@ -26,11 +25,9 @@ import static org.assertj.core.api.Assertions.assertThat;
public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
private BeanDescriptor<Customer> customerBeanDescriptor = getBeanDescriptor(Customer.class);
private TDEbeanServer mockEbeanServer = new TDEbeanServer();
private BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup());
private final BeanDescriptor<Customer> customerBeanDescriptor = getBeanDescriptor(Customer.class);
private final TDEbeanServer mockEbeanServer = new TDEbeanServer();
private final BinaryTransactionEventReader reader = new BinaryTransactionEventReader(new TDServerLookup());
@Override
protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
@@ -80,7 +77,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
@Test
public void readWrite_RemoteTableMod() throws IOException {
RemoteTransactionEvent event = new RemoteTransactionEvent("db");
Set<String> tables = new HashSet<>();
@@ -96,7 +92,6 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
}
class TDServerLookup implements ServerLookup {
@Override
public EbeanServer getServer(String name) {
return mockEbeanServer;
ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java
+1 -1
View File
@@ -17,7 +17,7 @@ public class TestM2MVanilla extends BaseTestCase {
@Test
public void testVanilla() {
DB.createSqlUpdate("delete from mrole_muser").execute();
DB.sqlUpdate("delete from mrole_muser").execute();
DB.sqlUpdate("delete from mrole").execute();
DB.sqlUpdate("delete from muser").execute();
ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class TestEncryptBinary extends BaseTestCase {
DB.save(e);
SqlRow row = DB.createSqlQuery("select * from e_basicenc_bin where id = :id")
SqlRow row = DB.sqlQuery("select * from e_basicenc_bin where id = :id")
.setParameter("id", e.getId())
.findOne();
ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
Transaction txn = server().beginTransaction();
try {
EBasicWithUniqueCon v2 = createEntityWithName("conflict", "after");
txn.flushBatch();
txn.flush();
Savepoint sp = txn.getConnection().setSavepoint();
try {
server().save(v2); // unique key violation
ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.tests.model.basic.mapsuper;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.WhenCreated;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
@@ -9,7 +9,7 @@ import java.sql.Timestamp;
@MappedSuperclass
public class MapSuperNoId {
@CreatedTimestamp
@WhenCreated
Timestamp whenCreated;
@Version
ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java
+2 -2
View File
@@ -17,11 +17,11 @@ public class TestDeleteUnloadedChildren extends BaseTestCase {
SqlUpdate delete;
sql = "delete from td_child";
delete = DB.createSqlUpdate(sql);
delete = DB.sqlUpdate(sql);
delete.execute();
sql = "delete from td_parent";
delete = DB.createSqlUpdate(sql);
delete = DB.sqlUpdate(sql);
delete.execute();
EdParent parent = new EdParent();
ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.tests.model.embedded;
import io.ebean.Model;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.WhenCreated;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ public class UserInterestLive extends Model {
@EmbeddedId
private final UserInterestLiveKey key;
@CreatedTimestamp
@WhenCreated
private Date createdAt;
public UserInterestLive(UserInterestLiveKey key) {
ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java
+4 -4
View File
@@ -1,7 +1,7 @@
package org.tests.model.joda;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.UpdatedTimestamp;
import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -19,10 +19,10 @@ public class BasicJodaEntity {
String name;
@CreatedTimestamp
@WhenCreated
LocalDateTime created;
@UpdatedTimestamp
@WhenModified
DateTime updated;
Period period;
ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.tests.model.noid;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.WhenCreated;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -14,7 +14,7 @@ public class NoIdBean {
String subject;
@CreatedTimestamp
@WhenCreated
Timestamp whenCreated;
public String getName() {
ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class TestOneToManyJoinTable extends BaseTestCase {
long intersectionRows = DB.sqlQuery("select count(*) as total from troop_monkey where troop_pid = ?")
.setParameter(1, troop.getPid())
.findSingleLong();
.mapToScalar(Long.class).findOne();
assertThat(intersectionRows).isEqualTo(2L);
ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class TestQueryFindNative extends BaseTestCase {
List<Integer> ids = DB.sqlQuery(sql)
.setParameter(1, "J%")
.findSingleAttributeList(Integer.class);
.mapToScalar(Integer.class).findList();
List<Integer> idsScalar =
server()
ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
+9 -9
View File
@@ -158,7 +158,7 @@ public abstract class BaseTestCase {
}
public boolean isPlatformCaseSensitive() {
return spiEbeanServer().getDatabasePlatform().isCaseSensitiveCollation();
return spiEbeanServer().databasePlatform().isCaseSensitiveCollation();
}
/**
@@ -206,7 +206,7 @@ public abstract class BaseTestCase {
}
public boolean isPlatformBooleanNative() {
return Types.BOOLEAN == spiEbeanServer().getDatabasePlatform().getBooleanDbType();
return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType();
}
public boolean isPlatformOrderNullsSupport() {
@@ -214,11 +214,11 @@ public abstract class BaseTestCase {
}
public boolean isPlatformSupportsDeleteTableAlias() {
return spiEbeanServer().getDatabasePlatform().isSupportsDeleteTableAlias();
return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias();
}
public boolean isPersistBatchOnCascade() {
return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
}
/**
@@ -237,19 +237,19 @@ public abstract class BaseTestCase {
}
protected Platform platform() {
return spiEbeanServer().getDatabasePlatform().getPlatform().base();
return spiEbeanServer().databasePlatform().getPlatform().base();
}
protected IdType idType() {
return spiEbeanServer().getDatabasePlatform().getDbIdentity().getIdType();
return spiEbeanServer().databasePlatform().getDbIdentity().getIdType();
}
protected SpiEbeanServer spiEbeanServer() {
return (SpiEbeanServer) DB.getDefault();
}
protected EbeanServer server() {
return Ebean.getDefaultServer();
protected Database server() {
return DB.getDefault();
}
/**
@@ -283,7 +283,7 @@ public abstract class BaseTestCase {
}
protected String concat(String property0, String separator, String property1, String suffix) {
DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().getDatabasePlatform());
DbExpressionHandler dbExpressionHandler = DbExpressionHandlerFactory.from(spiEbeanServer().databasePlatform());
return dbExpressionHandler.concat(property0, separator, property1, suffix);
}
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+5 -6
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.dbmigration.ddlgeneration;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.config.ServerConfig;
import io.ebean.DB;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.hana.HanaPlatform;
@@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class BaseDdlHandlerTest extends BaseTestCase {
private ServerConfig serverConfig = new ServerConfig();
private final DatabaseConfig serverConfig = new DatabaseConfig();
private DdlHandler handler(DatabasePlatform platform) {
return PlatformDdlBuilder.create(platform).createDdlHandler(serverConfig);
@@ -227,7 +227,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
@Test
public void generateChangeSetFromModel() throws Exception {
SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer();
SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault();
ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet();
@@ -246,8 +246,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
@Disabled
@Test
public void generateChangeSetFromModel_given_postgresTypes() throws Exception {
SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer();
SpiEbeanServer defaultServer = (SpiEbeanServer) DB.getDefault();
ChangeSet createChangeSet = new CurrentModel(defaultServer).getChangeSet();
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
+4 -6
View File
@@ -1,18 +1,18 @@
package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
import io.ebean.config.dbplatform.oracle.OraclePlatform;
import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
import io.ebeaninternal.dbmigration.migration.AddTableComment;
import io.ebeaninternal.dbmigration.migration.AlterColumn;
import io.ebeaninternal.dbmigration.migration.Column;
import io.ebeaninternal.dbmigration.migration.CreateTable;
import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -24,13 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class BaseTableDdlTest {
private ServerConfig serverConfig = new ServerConfig();
private PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform());
private final DatabaseConfig serverConfig = new DatabaseConfig();
private final PlatformDdl h2ddl = PlatformDdlBuilder.create(new H2Platform());
@Test
public void testAlterColumn() throws IOException {
BaseTableDdl ddlGen = new BaseTableDdl(serverConfig, h2ddl);
DdlWrite write = new DdlWrite();
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
+5 -5
View File
@@ -1,14 +1,14 @@
package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.Ebean;
import io.ebean.DB;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
import io.ebeaninternal.dbmigration.model.CurrentModel;
import io.ebeaninternal.dbmigration.model.MConfiguration;
import io.ebeaninternal.dbmigration.model.ModelContainer;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -19,7 +19,7 @@ public class H2HistoryDdlTest {
@Test
public void testRegenerateHistoryTriggers() throws Exception {
SpiEbeanServer ebeanServer = (SpiEbeanServer) Ebean.getDefaultServer();
SpiEbeanServer ebeanServer = (SpiEbeanServer) DB.getDefault();
HistoryTableUpdate update = new HistoryTableUpdate("c_user");
update.add(HistoryTableUpdate.Change.ADD, "one");
@@ -32,7 +32,7 @@ public class H2HistoryDdlTest {
H2Platform h2Platform = new H2Platform();
PlatformDdl h2Ddl = PlatformDdlBuilder.create(h2Platform);
h2Ddl.configure(ebeanServer.getServerConfig());
h2Ddl.configure(ebeanServer.config());
h2Ddl.regenerateHistoryTriggers(write, update);
assertThat(write.applyHistoryView().isEmpty()).isFalse();
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
+9 -9
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.ddlgeneration.platform;
import io.ebean.config.ServerConfig;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.h2.H2Platform;
import io.ebean.config.dbplatform.hana.HanaPlatform;
import io.ebean.config.dbplatform.mysql.MySqlPlatform;
@@ -14,12 +14,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class PlatformDdl_dropUniqueConstraintTest {
private PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform());
private PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
private PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
private PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
private PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
private PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
private final PlatformDdl h2Ddl = PlatformDdlBuilder.create(new H2Platform());
private final PlatformDdl pgDdl = PlatformDdlBuilder.create(new PostgresPlatform());
private final PlatformDdl mysqlDdl = PlatformDdlBuilder.create(new MySqlPlatform());
private final PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform());
private final PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform());
private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
@Test
public void test() throws Exception {
@@ -39,8 +39,8 @@ public class PlatformDdl_dropUniqueConstraintTest {
sql = mysqlDdl.alterTableDropUniqueConstraint("mytab", "uq_name");
assertEquals("alter table mytab drop index uq_name", sql);
ServerConfig serverConfig = new ServerConfig();
hanaDdl.configure(serverConfig);
DatabaseConfig config = new DatabaseConfig();
hanaDdl.configure(config);
sql = hanaDdl.alterTableDropUniqueConstraint("mytab", "uq_name");
assertEquals("delimiter $$\n" +
"do\n" +
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase {
ModelContainer model = new ModelContainer();
DbConstraintNaming constraintNaming = defaultServer.getServerConfig().getConstraintNaming();
DbConstraintNaming constraintNaming = defaultServer.config().getConstraintNaming();
constraintNaming.setMaxLength(new DefaultConstraintMaxLength(60));
ModelBuildContext ctx = new ModelBuildContext(model, new H2Platform(), constraintNaming, true);
ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java
+3 -4
View File
@@ -1,7 +1,7 @@
package org.tests.inheritance.company.domain;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.DB;
import io.ebean.Database;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -13,8 +13,7 @@ public class TestInheritAbstract {
@Test
public void testMe() {
EbeanServer server = Ebean.getServer(null);
Database server = DB.getDefault();
List<AbstractBar> list0 = server.find(AbstractBar.class)
.findList();
ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java
+1 -1
View File
@@ -11,7 +11,7 @@ public class BaseTestCase {
}
protected Platform platform() {
return spiEbeanServer().getDatabasePlatform().getPlatform().base();
return spiEbeanServer().platform().base();
}
protected SpiEbeanServer spiEbeanServer() {