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()