mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
#2357 - Update tests to use reference()
This commit is contained in:
rbygrave
+4
-4
@@ -15,7 +15,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
|
||||
|
||||
@Test
|
||||
public void getReference_noPC() {
|
||||
DB.getReference(Customer.class, 42);
|
||||
DB.reference(Customer.class, 42);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -25,7 +25,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
|
||||
|
||||
DB.execute(() -> {
|
||||
Customer loaded = DB.find(Customer.class, 1);
|
||||
Customer reference = DB.getReference(Customer.class, 1);
|
||||
Customer reference = DB.reference(Customer.class, 1);
|
||||
assertThat(loaded).isSameAs(reference);
|
||||
});
|
||||
}
|
||||
@@ -38,7 +38,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
|
||||
car.setDriver("TestForRef");
|
||||
DB.save(car);
|
||||
|
||||
Vehicle reference = DB.getReference(Vehicle.class, car.getId());
|
||||
Vehicle reference = DB.reference(Vehicle.class, car.getId());
|
||||
|
||||
assertThat(reference).isInstanceOf(Car.class);
|
||||
assertThat(reference.getId()).isSameAs(car.getId());
|
||||
@@ -56,7 +56,7 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
|
||||
|
||||
DB.execute(() -> {
|
||||
Vehicle loaded = DB.find(Vehicle.class, car.getId());
|
||||
Vehicle reference = DB.getReference(Vehicle.class, car.getId());
|
||||
Vehicle reference = DB.reference(Vehicle.class, car.getId());
|
||||
assertThat(reference).isSameAs(loaded);
|
||||
}
|
||||
);
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase {
|
||||
public void test() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
Order order = DB.getReference(Order.class, 1);
|
||||
Order order = DB.reference(Order.class, 1);
|
||||
|
||||
BeanState beanState = DB.beanState(order);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
|
||||
@@ -13,7 +13,7 @@ public class TestBatchLazyMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
Order order2 = DB.getReference(Order.class, 1);
|
||||
Order order2 = DB.reference(Order.class, 1);
|
||||
order2.getOrderDate();
|
||||
|
||||
// List<Order> list = DB.find(Order.class)
|
||||
|
||||
@@ -23,7 +23,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase {
|
||||
ServerCache beanCache = DB.cacheManager().beanCache(Order.class);
|
||||
beanCache.clear();
|
||||
|
||||
Order order = DB.getReference(Order.class, 1);
|
||||
Order order = DB.reference(Order.class, 1);
|
||||
|
||||
assertTrue(DB.beanState(order).isReference());
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ public class TestManyLazyLoad extends BaseTestCase {
|
||||
Order order = list.get(0);
|
||||
|
||||
// get it as a reference
|
||||
Order order1 = DB.getReference(Order.class, order.getId());
|
||||
Order order1 = DB.reference(Order.class, order.getId());
|
||||
assertNotNull(order1);
|
||||
|
||||
Date orderDate = order1.getOrderDate();
|
||||
@@ -48,7 +48,7 @@ public class TestManyLazyLoad extends BaseTestCase {
|
||||
DB.find(OrderDetail.class, orderDetail.getId());
|
||||
|
||||
// change order... list before a scalar property
|
||||
Order order2 = DB.getReference(Order.class, order.getId());
|
||||
Order order2 = DB.reference(Order.class, order.getId());
|
||||
assertNotNull(order2);
|
||||
|
||||
List<OrderDetail> details2 = order2.getDetails();
|
||||
|
||||
@@ -37,7 +37,7 @@ public class TestPersistenceContext extends BaseTestCase {
|
||||
// finds an existing bean in the persistence context
|
||||
// ... so doesn't even execute a query
|
||||
Order o2 = DB.find(Order.class, 1);
|
||||
Order o3 = DB.getReference(Order.class, 1);
|
||||
Order o3 = DB.reference(Order.class, 1);
|
||||
|
||||
// all the same instance
|
||||
assertTrue(order == o2);
|
||||
|
||||
@@ -36,15 +36,15 @@ public class TestQueryWithCache extends BaseTestCase {
|
||||
ServerCache beanCache = serverCacheManager.beanCache(Country.class);
|
||||
assertEquals(0, beanCache.size());
|
||||
|
||||
Country nz1 = DB.getReference(Country.class, "NZ");
|
||||
Country nz1 = DB.reference(Country.class, "NZ");
|
||||
assertEquals(0, beanCache.size());
|
||||
|
||||
// has the effect of loading the cache via lazy loading
|
||||
nz1.getName();
|
||||
assertEquals(1, beanCache.size());
|
||||
|
||||
Country nz2 = DB.getReference(Country.class, "NZ");
|
||||
Country nz2b = DB.getReference(Country.class, "NZ");
|
||||
Country nz2 = DB.reference(Country.class, "NZ");
|
||||
Country nz2b = DB.reference(Country.class, "NZ");
|
||||
|
||||
Country nz3 = DB.find(Country.class, "NZ");
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class TestDeleteByIdList extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
OrderDetail dummy = DB.getReference(OrderDetail.class, 1);
|
||||
OrderDetail dummy = DB.reference(OrderDetail.class, 1);
|
||||
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
|
||||
server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy);
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class TestDeleteCascadeById extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
OrderDetail dummy = DB.getReference(OrderDetail.class, 1);
|
||||
OrderDetail dummy = DB.reference(OrderDetail.class, 1);
|
||||
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
|
||||
server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy);
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ public class TestLazyLoadNonExistantBean extends BaseTestCase {
|
||||
public void testSimple() {
|
||||
|
||||
UUID uuid = UUID.randomUUID();
|
||||
UUOne one = DB.getReference(UUOne.class, uuid);
|
||||
UUOne one = DB.reference(UUOne.class, uuid);
|
||||
|
||||
try {
|
||||
// invoke lazy loading
|
||||
|
||||
@@ -16,7 +16,7 @@ public class TestLazyLoadNonExistentBean extends BaseTestCase {
|
||||
public void testSimple() {
|
||||
|
||||
UUID uuid = UUID.randomUUID();
|
||||
UUOne one = DB.getReference(UUOne.class, uuid);
|
||||
UUOne one = DB.reference(UUOne.class, uuid);
|
||||
|
||||
try {
|
||||
// invoke lazy loading
|
||||
|
||||
@@ -26,13 +26,13 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
// reset the statistics
|
||||
countryCache.statistics(true);
|
||||
|
||||
Country c0 = DB.getReference(Country.class, "NZ");
|
||||
Country c0 = DB.reference(Country.class, "NZ");
|
||||
ServerCacheStatistics statistics = countryCache.statistics(false);
|
||||
long hc = statistics.getHitCount();
|
||||
assertEquals(1, hc);
|
||||
assertNotNull(c0);
|
||||
|
||||
// Country c1 = DB.getReference(Country.class, "NZ");
|
||||
// Country c1 = DB.reference(Country.class, "NZ");
|
||||
// assertEquals(2, countryCache.getStatistics(false).getHitCount());
|
||||
// //assertEquals(100,
|
||||
// countryCache.getStatistics(false).getHitRatio());
|
||||
@@ -62,7 +62,7 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
//
|
||||
// assertTrue(countryCache.getStatistics(false).getHitCount() > 0);
|
||||
//
|
||||
// //Country c3 = DB.getReference(Country.class, "NZ");
|
||||
// //Country c3 = DB.reference(Country.class, "NZ");
|
||||
// //Country c4 = DB.find(Country.class, "NZ");
|
||||
//
|
||||
//
|
||||
@@ -134,7 +134,7 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
// assertEquals("0 country in cache", 0, countryCache.size());
|
||||
//
|
||||
// // reference doesn't load cache yet
|
||||
// Country c11 = DB.getReference(Country.class, "NZ");
|
||||
// Country c11 = DB.reference(Country.class, "NZ");
|
||||
//
|
||||
// // still 0 in cache
|
||||
// assertEquals("0 country in cache", 0, countryCache.size());
|
||||
|
||||
@@ -21,7 +21,7 @@ public class TestCacheCustomer extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
Country nz = DB.getReference(Country.class, "NZ");
|
||||
Country nz = DB.reference(Country.class, "NZ");
|
||||
Address address = new Address();
|
||||
address.setLine1("Some Place");
|
||||
address.setCity("Auckland");
|
||||
|
||||
@@ -53,7 +53,7 @@ public class TestForeignKeyModes extends BaseTestCase {
|
||||
@Test
|
||||
public void noneViaManyToMany() {
|
||||
|
||||
DfkOne one = DB.getReference(DfkOne.class, 999L);
|
||||
DfkOne one = DB.reference(DfkOne.class, 999L);
|
||||
|
||||
DfkNoneViaMtoM none = new DfkNoneViaMtoM("none2");
|
||||
none.getOnes().add(one);
|
||||
|
||||
@@ -17,13 +17,13 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
|
||||
public void testSimpleBeanDelete_missingBean_returnsFalse() {
|
||||
|
||||
// delete by by without version loaded ... should not throw OptimisticLockException
|
||||
Contact ref = DB.getReference(Contact.class, 999999);
|
||||
Contact ref = DB.reference(Contact.class, 999999);
|
||||
assertThat(DB.delete(ref)).isFalse();
|
||||
|
||||
assertThat(DB.delete(Contact.class, 999999)).isEqualTo(0);
|
||||
|
||||
// same as above but using Model.delete()
|
||||
Group modelRef = DB.getReference(Group.class, 999999);
|
||||
Group modelRef = DB.reference(Group.class, 999999);
|
||||
assertThat(modelRef.delete()).isFalse();
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
|
||||
EBasicVer basic = new EBasicVer("DelTest");
|
||||
DB.save(basic);
|
||||
|
||||
EBasicVer basicRef = DB.getReference(EBasicVer.class, basic.getId());
|
||||
EBasicVer basicRef = DB.reference(EBasicVer.class, basic.getId());
|
||||
assertThat(DB.delete(basicRef)).isTrue();
|
||||
}
|
||||
|
||||
@@ -50,10 +50,10 @@ public class TestDeleteWithoutOptimisticLocking extends BaseTestCase {
|
||||
transaction.setBatchMode(true);
|
||||
|
||||
// returns true even though the delete has not occurred yet
|
||||
assertThat(server.delete(DB.getReference(EBasicVer.class, basic.getId()), transaction)).isTrue();
|
||||
assertThat(server.delete(DB.reference(EBasicVer.class, basic.getId()), transaction)).isTrue();
|
||||
|
||||
// returns true even though the bean does not exist
|
||||
assertThat(server.delete(DB.getReference(EBasicVer.class, 999999), transaction)).isTrue();
|
||||
assertThat(server.delete(DB.reference(EBasicVer.class, 999999), transaction)).isTrue();
|
||||
|
||||
transaction.commit();
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ public class TestInheritanceOnMany extends BaseTestCase {
|
||||
LoggedSqlCollector.start();
|
||||
// Dog is concrete so we return as Dog even though
|
||||
// it could be a BigDog (so we are trusting the caller)
|
||||
Dog ref = DB.getReference(Dog.class, dog.getId());
|
||||
Dog ref = DB.reference(Dog.class, dog.getId());
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).isEmpty();
|
||||
@@ -83,7 +83,7 @@ public class TestInheritanceOnMany extends BaseTestCase {
|
||||
DB.save(bd);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
BigDog bigDog = DB.getReference(BigDog.class, bd.getId());
|
||||
BigDog bigDog = DB.reference(BigDog.class, bd.getId());
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).isEmpty();
|
||||
@@ -95,7 +95,7 @@ public class TestInheritanceOnMany extends BaseTestCase {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
// Animal is abstract so we hit the DB
|
||||
Animal animal = DB.getReference(Animal.class, bd.getId());
|
||||
Animal animal = DB.reference(Animal.class, bd.getId());
|
||||
|
||||
sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).hasSize(1);
|
||||
|
||||
@@ -37,7 +37,7 @@ public class TestIntInherit extends BaseTestCase {
|
||||
TIntRoot result1 = DB.find(TIntRoot.class, r.getId());
|
||||
assertTrue(result1 instanceof TIntRoot);
|
||||
|
||||
TIntRoot ref3 = DB.getReference(TIntRoot.class, c1.getId());
|
||||
TIntRoot ref3 = DB.reference(TIntRoot.class, c1.getId());
|
||||
assertTrue(ref3 instanceof TIntRoot);
|
||||
|
||||
TIntRoot result3 = DB.find(TIntRoot.class, c1.getId());
|
||||
|
||||
+2
-2
@@ -33,10 +33,10 @@ public class TestInheritanceCache extends BaseTestCase {
|
||||
|
||||
assertThat(gotOneFromCache).isInstanceOf(CInhOne.class);
|
||||
|
||||
CInhRoot refOne = DB.getReference(CInhRoot.class, one.getId());
|
||||
CInhRoot refOne = DB.reference(CInhRoot.class, one.getId());
|
||||
assertThat(refOne).isInstanceOf(CInhOne.class);
|
||||
|
||||
CInhRoot refOneSub = DB.getReference(CInhOne.class, one.getId());
|
||||
CInhRoot refOneSub = DB.reference(CInhOne.class, one.getId());
|
||||
assertThat(refOneSub).isNotNull();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ public class TestInsertDataIntegrityException extends BaseTestCase {
|
||||
ResetBasicData.reset();
|
||||
|
||||
// an invalid foreign key value
|
||||
Customer invalidCustomer = DB.getReference(Customer.class, 900000);
|
||||
Customer invalidCustomer = DB.reference(Customer.class, 900000);
|
||||
|
||||
Order order = new Order();
|
||||
order.setStatus(Order.Status.NEW);
|
||||
|
||||
@@ -237,7 +237,7 @@ public class ResetBasicData {
|
||||
shippingAddr.setLine1(shippingStreet);
|
||||
shippingAddr.setLine2("Sandringham");
|
||||
shippingAddr.setCity("Auckland");
|
||||
shippingAddr.setCountry(DB.getReference(Country.class, "NZ"));
|
||||
shippingAddr.setCountry(DB.reference(Country.class, "NZ"));
|
||||
|
||||
c.setShippingAddress(shippingAddr);
|
||||
}
|
||||
@@ -247,7 +247,7 @@ public class ResetBasicData {
|
||||
billingAddr.setLine1(billingStreet);
|
||||
billingAddr.setLine2("St Lukes");
|
||||
billingAddr.setCity("Auckland");
|
||||
billingAddr.setCountry(DB.getReference(Country.class, "NZ"));
|
||||
billingAddr.setCountry(DB.reference(Country.class, "NZ"));
|
||||
|
||||
c.setBillingAddress(billingAddr);
|
||||
}
|
||||
@@ -257,9 +257,9 @@ public class ResetBasicData {
|
||||
|
||||
private Order createOrder1(Customer customer) {
|
||||
|
||||
Product product1 = DB.getReference(Product.class, 1);
|
||||
Product product2 = DB.getReference(Product.class, 2);
|
||||
Product product3 = DB.getReference(Product.class, 3);
|
||||
Product product1 = DB.reference(Product.class, 1);
|
||||
Product product2 = DB.reference(Product.class, 2);
|
||||
Product product3 = DB.reference(Product.class, 3);
|
||||
|
||||
|
||||
Order order = new Order();
|
||||
@@ -281,7 +281,7 @@ public class ResetBasicData {
|
||||
|
||||
private void createOrder2(Customer customer) {
|
||||
|
||||
Product product1 = DB.getReference(Product.class, 1);
|
||||
Product product1 = DB.reference(Product.class, 1);
|
||||
|
||||
Order order = new Order();
|
||||
order.setStatus(Status.SHIPPED);
|
||||
@@ -299,8 +299,8 @@ public class ResetBasicData {
|
||||
|
||||
private void createOrder3(Customer customer) {
|
||||
|
||||
Product product1 = DB.getReference(Product.class, 1);
|
||||
Product product3 = DB.getReference(Product.class, 3);
|
||||
Product product1 = DB.reference(Product.class, 1);
|
||||
Product product3 = DB.reference(Product.class, 3);
|
||||
|
||||
Order order = new Order();
|
||||
order.setStatus(Status.COMPLETE);
|
||||
|
||||
@@ -24,7 +24,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
|
||||
|
||||
DB.getDefault().cacheManager().clearAll();
|
||||
|
||||
Country nz = DB.getReference(Country.class, "NZ");
|
||||
Country nz = DB.reference(Country.class, "NZ");
|
||||
|
||||
EAddr addr = new EAddr("Foo", "Bar", nz);
|
||||
EPerAddr perAddr = new EPerAddr("Embed", addr);
|
||||
|
||||
@@ -14,7 +14,7 @@ public class TestPview extends BaseTestCase {
|
||||
@Test
|
||||
public void test() {
|
||||
|
||||
Wview wview = DB.getReference(Wview.class, UUID.randomUUID());
|
||||
Wview wview = DB.reference(Wview.class, UUID.randomUUID());
|
||||
|
||||
Query<Paggview> query = DB.find(Paggview.class);
|
||||
query.select("amount");
|
||||
|
||||
@@ -19,7 +19,7 @@ public class TestReferenceSave {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
|
||||
EPersonOnline bean = DB.getReference(EPersonOnline.class, 1L);
|
||||
EPersonOnline bean = DB.reference(EPersonOnline.class, 1L);
|
||||
DB.save(bean);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.current();
|
||||
|
||||
@@ -118,7 +118,7 @@ public class TestManyWhereJoin extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
Product product = DB.getReference(Product.class, 1L);
|
||||
Product product = DB.reference(Product.class, 1L);
|
||||
|
||||
Query<Order> query = DB.find(Order.class)
|
||||
//.fetch("details")
|
||||
@@ -152,7 +152,7 @@ public class TestManyWhereJoin extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
Product product = DB.getReference(Product.class, 1L);
|
||||
Product product = DB.reference(Product.class, 1L);
|
||||
|
||||
Query<Order> query = DB.find(Order.class)
|
||||
.fetch("details")
|
||||
|
||||
@@ -28,7 +28,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase {
|
||||
// now lazy load the contacts
|
||||
contacts2.size();
|
||||
|
||||
Customer c2 = DB.getReference(Customer.class, c.getId());
|
||||
Customer c2 = DB.reference(Customer.class, c.getId());
|
||||
|
||||
// we only "loaded" the contacts BeanList and not all of c2
|
||||
List<Contact> contacts = c2.getContacts();
|
||||
|
||||
@@ -43,7 +43,7 @@ public class TestOrderByWithDistinct extends BaseTestCase {
|
||||
@IgnorePlatform({Platform.MYSQL, Platform.MARIADB, Platform.SQLSERVER, Platform.NUODB}) // do not support nulls first/last
|
||||
public void testDistinctOn() {
|
||||
|
||||
MRole role = DB.getReference(MRole.class, 1);
|
||||
MRole role = DB.reference(MRole.class, 1);
|
||||
|
||||
Query<MUser> query = DB.find(MUser.class)
|
||||
.where()
|
||||
|
||||
@@ -30,7 +30,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
|
||||
|
||||
JsonContext jsonContext = DB.json();
|
||||
|
||||
Product product = DB.getReference(Product.class, 1);
|
||||
Product product = DB.reference(Product.class, 1);
|
||||
|
||||
BeanState beanState0 = DB.beanState(product);
|
||||
if (!beanState0.isReference()) {
|
||||
|
||||
@@ -20,7 +20,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase {
|
||||
|
||||
Customer c0 = ResetBasicData.createCustAndOrder("Test Json");
|
||||
|
||||
Customer c2 = DB.getReference(Customer.class, c0.getId());
|
||||
Customer c2 = DB.reference(Customer.class, c0.getId());
|
||||
List<Order> orders = c2.getOrders();
|
||||
|
||||
assertEquals(1, orders.size());
|
||||
@@ -30,7 +30,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase {
|
||||
|
||||
assertTrue(size >= 3);
|
||||
|
||||
Customer cref = DB.getReference(Customer.class, c0.getId());
|
||||
Customer cref = DB.reference(Customer.class, c0.getId());
|
||||
order.setCustomer(cref);
|
||||
order.setStatus(Status.SHIPPED);
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase {
|
||||
OrderDetail removedDetail = order.getDetails().remove(2);
|
||||
assertNotNull(removedDetail);
|
||||
|
||||
Product p = DB.getReference(Product.class, 1);
|
||||
Product p = DB.reference(Product.class, 1);
|
||||
OrderDetail newDetail = new OrderDetail(p, 899, 12.12d);
|
||||
// newDetail.setOrder(order);
|
||||
order.addDetail(newDetail);
|
||||
|
||||
Reference in New Issue
Block a user