mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
#2357 - Update tests to use beanState()
This commit is contained in:
rbygrave
@@ -30,7 +30,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
|
||||
user.setEmail("change@junk.com");
|
||||
|
||||
|
||||
BeanState beanState = DB.getBeanState(user);
|
||||
BeanState beanState = DB.beanState(user);
|
||||
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
|
||||
|
||||
user.markPropertyUnset("email");
|
||||
@@ -54,7 +54,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
|
||||
user.setName("name mod");
|
||||
user.setEmail("change@junk.com");
|
||||
|
||||
BeanState beanState = DB.getBeanState(user);
|
||||
BeanState beanState = DB.beanState(user);
|
||||
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
|
||||
|
||||
// unset the loaded state for email
|
||||
@@ -72,7 +72,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
|
||||
user.setName("name mod");
|
||||
user.setEmail("change@junk.com");
|
||||
|
||||
BeanState beanState = DB.getBeanState(user);
|
||||
BeanState beanState = DB.beanState(user);
|
||||
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ public class TestUnsetLoadedProperties extends BaseTestCase {
|
||||
user.setName("name mod");
|
||||
user.setEmail("change@junk.com");
|
||||
|
||||
BeanState beanState = DB.getBeanState(user);
|
||||
BeanState beanState = DB.beanState(user);
|
||||
assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email");
|
||||
|
||||
DB.getBeanState(user).setPropertyLoaded("email", false);
|
||||
DB.beanState(user).setPropertyLoaded("email", false);
|
||||
assertThat(beanState.getLoadedProps()).containsExactly("id", "name");
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase {
|
||||
ResetBasicData.reset();
|
||||
Order order = DB.getReference(Order.class, 1);
|
||||
|
||||
BeanState beanState = DB.getBeanState(order);
|
||||
BeanState beanState = DB.beanState(order);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
|
||||
assertEquals(1, loadedProps.size());
|
||||
|
||||
@@ -25,7 +25,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase {
|
||||
|
||||
Order order = DB.getReference(Order.class, 1);
|
||||
|
||||
assertTrue(DB.getBeanState(order).isReference());
|
||||
assertTrue(DB.beanState(order).isReference());
|
||||
|
||||
// invoke lazy loading
|
||||
Date orderDate = order.getOrderDate();
|
||||
@@ -34,10 +34,10 @@ public class TestBeanReferenceRefresh extends BaseTestCase {
|
||||
Customer customer = order.getCustomer();
|
||||
assertNotNull(customer);
|
||||
|
||||
assertFalse(DB.getBeanState(order).isReference());
|
||||
assertFalse(DB.beanState(order).isReference());
|
||||
assertNotNull(order.getStatus());
|
||||
assertNotNull(order.getDetails());
|
||||
assertNull(DB.getBeanState(order).getLoadedProps());
|
||||
assertNull(DB.beanState(order).getLoadedProps());
|
||||
|
||||
Status status = order.getStatus();
|
||||
assertTrue(status != Order.Status.SHIPPED);
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ public class TestEnhancementCollectionInitialisation extends BaseTestCase {
|
||||
@Test
|
||||
public void testListInitialisation() {
|
||||
Customer customer = new Customer();
|
||||
BeanState beanState = DB.getBeanState(customer);
|
||||
BeanState beanState = DB.beanState(customer);
|
||||
if (beanState != null) {
|
||||
List<Order> orders = customer.getOrders();
|
||||
assertNotNull(orders);
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TestLazyLoadInCache extends BaseTestCase {
|
||||
|
||||
assertTrue(cust1 != cust1B);
|
||||
|
||||
Set<String> loadedProps = DB.getBeanState(cust1).getLoadedProps();
|
||||
Set<String> loadedProps = DB.beanState(cust1).getLoadedProps();
|
||||
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("status"));
|
||||
|
||||
@@ -34,7 +34,7 @@ public class TestSharedInstancePropagation extends BaseTestCase {
|
||||
|
||||
|
||||
assertNotNull(order);
|
||||
assertTrue(DB.getBeanState(order).isReadOnly());
|
||||
assertTrue(DB.beanState(order).isReadOnly());
|
||||
|
||||
List<OrderDetail> details = order.getDetails();
|
||||
BeanCollection<?> bc = (BeanCollection<?>) details;
|
||||
@@ -48,16 +48,16 @@ public class TestSharedInstancePropagation extends BaseTestCase {
|
||||
assertTrue(!bc.isEmpty());
|
||||
OrderDetail detail = details.get(0);
|
||||
|
||||
assertTrue(DB.getBeanState(detail).isReadOnly());
|
||||
assertFalse(DB.getBeanState(detail).isReference());
|
||||
assertTrue(DB.beanState(detail).isReadOnly());
|
||||
assertFalse(DB.beanState(detail).isReference());
|
||||
|
||||
Product product = detail.getProduct();
|
||||
|
||||
assertTrue(DB.getBeanState(product).isReadOnly());
|
||||
assertTrue(DB.beanState(product).isReadOnly());
|
||||
|
||||
// lazy load
|
||||
product.getName();
|
||||
assertFalse(DB.getBeanState(product).isReference());
|
||||
assertFalse(DB.beanState(product).isReference());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class TestBasicLazy extends BaseTestCase {
|
||||
final Customer customer = order.getCustomer();
|
||||
assertNotNull(customer);
|
||||
|
||||
assertTrue(DB.getBeanState(customer).isReference());
|
||||
assertTrue(DB.beanState(customer).isReference());
|
||||
|
||||
final Throwable throwables[] = new Throwable[2];
|
||||
Thread t1 = new Thread() {
|
||||
@@ -120,7 +120,7 @@ public class TestBasicLazy extends BaseTestCase {
|
||||
MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0;
|
||||
}
|
||||
|
||||
assertFalse(DB.getBeanState(customer).isReference());
|
||||
assertFalse(DB.beanState(customer).isReference());
|
||||
|
||||
if (throwables[0] != null) {
|
||||
throw throwables[0];
|
||||
|
||||
@@ -58,7 +58,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase {
|
||||
|
||||
for (UUTwo u : list) {
|
||||
u.getMaster();
|
||||
//BeanState beanState = DB.getBeanState(master);
|
||||
//BeanState beanState = DB.beanState(master);
|
||||
//assertTrue(beanState.isReference());
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ public class TestQueryJoin extends BaseTestCase {
|
||||
// list.get(0).getShipDate();
|
||||
|
||||
Order order = list.get(0);
|
||||
BeanState beanStateOrder = DB.getBeanState(order);
|
||||
BeanState beanStateOrder = DB.beanState(order);
|
||||
assertNotNull(beanStateOrder.getLoadedProps());
|
||||
// assertTrue(beanStateOrder.getLoadedProps().contains("id"));
|
||||
assertTrue(beanStateOrder.getLoadedProps().contains("status"));
|
||||
@@ -44,7 +44,7 @@ public class TestQueryJoin extends BaseTestCase {
|
||||
assertTrue(beanStateOrder.getLoadedProps().contains("customer"));
|
||||
|
||||
Customer customer = order.getCustomer();
|
||||
BeanState beanStateCustomer = DB.getBeanState(customer);
|
||||
BeanState beanStateCustomer = DB.beanState(customer);
|
||||
assertTrue(beanStateCustomer.isReference());
|
||||
|
||||
customer.getName();
|
||||
|
||||
@@ -91,7 +91,7 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
// assertTrue("these 2 are different",c5 != c6);
|
||||
//
|
||||
// // by default readOnly based on deployment annotation
|
||||
// assertTrue("read only",DB.getBeanState(c6).isReadOnly());
|
||||
// assertTrue("read only",DB.beanState(c6).isReadOnly());
|
||||
//
|
||||
// try {
|
||||
// // can't modify a readOnly bean
|
||||
@@ -107,7 +107,7 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
// .findOne();
|
||||
//
|
||||
// // Explicitly NOT readOnly
|
||||
// assertFalse("NOT read only",DB.getBeanState(c8).isReadOnly());
|
||||
// assertFalse("NOT read only",DB.beanState(c8).isReadOnly());
|
||||
//
|
||||
// assertEquals("1 countries in cache", 1, countryCache.size());
|
||||
// c8.setName("Nu Zilund");
|
||||
@@ -122,12 +122,12 @@ public class TestCacheBasic extends BaseTestCase {
|
||||
// .findOne();
|
||||
//
|
||||
// // Find loads cache ...
|
||||
// assertFalse(DB.getBeanState(c9).isReadOnly());
|
||||
// assertFalse(DB.beanState(c9).isReadOnly());
|
||||
// assertTrue(countryCache.size() > 0);
|
||||
//
|
||||
// Country c10 = DB.find(Country.class,"NZ");
|
||||
//
|
||||
// assertTrue(DB.getBeanState(c10).isReadOnly());
|
||||
// assertTrue(DB.beanState(c10).isReadOnly());
|
||||
// assertTrue(countryCache.size() > 0);
|
||||
//
|
||||
// DB.cacheManager().clear(Country.class);
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
|
||||
.findOne();
|
||||
|
||||
foundOrder.setStatus(Order.Status.APPROVED);
|
||||
assertTrue(DB.getBeanState(foundOrder).isDirty());
|
||||
assertTrue(DB.beanState(foundOrder).isDirty());
|
||||
|
||||
Customer foundCustomer = DB.find(Customer.class)
|
||||
.where().eq("id", customer.getId())
|
||||
@@ -46,7 +46,7 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase {
|
||||
Order order1 = foundCustomer.getOrders().get(0);
|
||||
|
||||
assertSame(foundOrder, order1);
|
||||
assertTrue(DB.getBeanState(foundOrder).isDirty());
|
||||
assertTrue(DB.beanState(foundOrder).isDirty());
|
||||
|
||||
} finally {
|
||||
DB.endTransaction();
|
||||
|
||||
@@ -44,7 +44,7 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase {
|
||||
assertNotNull(bean2);
|
||||
assertEquals("findById", bean2.getName());
|
||||
bean2.setName("something");
|
||||
BeanState beanState = DB.getBeanState(bean2);
|
||||
BeanState beanState = DB.beanState(bean2);
|
||||
assertTrue(beanState.isDirty());
|
||||
//bean2.getChildren().size();
|
||||
bean2.someRichObjectMethod();
|
||||
|
||||
@@ -251,7 +251,7 @@ public class TestQueryCache extends BaseTestCase {
|
||||
assertTrue(list3.size() > 0);
|
||||
// TODO: At this stage setReadOnly(false) does create a shallow copy of the List/Set/Map, but does not
|
||||
// change the read only state in the entities.
|
||||
// assertFalse(DB.getBeanState(list3.get(0)).isReadOnly());
|
||||
// assertFalse(DB.beanState(list3.get(0)).isReadOnly());
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ public class TestProtectedConstructor extends BaseTestCase {
|
||||
Object newBeanInstance = entityBean._ebean_newInstance();
|
||||
|
||||
assertNotNull(newBeanInstance);
|
||||
BeanState beanState = DB.getBeanState(newBeanInstance);
|
||||
BeanState beanState = DB.beanState(newBeanInstance);
|
||||
assertTrue(beanState.isNew());
|
||||
assertNotSame(entityBean, newBeanInstance);
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ public class TestInsertQueryUpdate extends BaseTestCase {
|
||||
.setId(e0.getId())
|
||||
.findOne();
|
||||
|
||||
BeanState beanState = DB.getBeanState(e1);
|
||||
BeanState beanState = DB.beanState(e1);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
assertFalse(loadedProps.contains("description"));
|
||||
//lastUpdate
|
||||
|
||||
@@ -101,7 +101,7 @@ public class TestJsonNodeBasic extends BaseTestCase {
|
||||
.setId(bean.getId())
|
||||
.findOne();
|
||||
|
||||
Set<String> loadedProps = DB.getBeanState(bean1).getLoadedProps();
|
||||
Set<String> loadedProps = DB.beanState(bean1).getLoadedProps();
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("content"));
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ public class TestJsonNodeBlob extends BaseTestCase {
|
||||
.setId(bean.getId())
|
||||
.findOne();
|
||||
|
||||
Set<String> loadedProps = DB.getBeanState(bean1).getLoadedProps();
|
||||
Set<String> loadedProps = DB.beanState(bean1).getLoadedProps();
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("content"));
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ public class TestJsonNodeJsonb extends BaseTestCase {
|
||||
.setId(bean.getId())
|
||||
.findOne();
|
||||
|
||||
Set<String> loadedProps = DB.getBeanState(bean1).getLoadedProps();
|
||||
Set<String> loadedProps = DB.beanState(bean1).getLoadedProps();
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("content"));
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ public class TestJsonNodeVarchar extends BaseTestCase {
|
||||
.setId(bean.getId())
|
||||
.findOne();
|
||||
|
||||
Set<String> loadedProps = DB.getBeanState(bean1).getLoadedProps();
|
||||
Set<String> loadedProps = DB.beanState(bean1).getLoadedProps();
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("content"));
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ public class TestPrinterStateIssue extends BaseTestCase {
|
||||
state1.setFlags(7L);
|
||||
|
||||
|
||||
// BeanState beanState = DB.getBeanState(printer1);
|
||||
// BeanState beanState = DB.beanState(printer1);
|
||||
// Set<String> changedProps = beanState.getChangedProps();
|
||||
// System.out.println("changed: "+changedProps);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ public class TestTextJsonSelfRef extends BaseTestCase {
|
||||
|
||||
// Check that there are no 'reference' beans here
|
||||
for (SelfRefCustomer cust : customers) {
|
||||
BeanState beanState = DB.getBeanState(cust);
|
||||
BeanState beanState = DB.beanState(cust);
|
||||
assertFalse(beanState.isReference());
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ public class TestDefaultFetchLazy extends BaseTestCase {
|
||||
|
||||
MyLobSize myLobSize = DB.find(MyLobSize.class, m.getId());
|
||||
|
||||
BeanState beanState = DB.getBeanState(myLobSize);
|
||||
BeanState beanState = DB.beanState(myLobSize);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
|
||||
assertNotNull(loadedProps);
|
||||
|
||||
@@ -25,24 +25,24 @@ public class TestQueryFindReadOnly extends BaseTestCase {
|
||||
Article ar1 = DB.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne();
|
||||
|
||||
assertNotNull(ar1);
|
||||
assertTrue(DB.getBeanState(ar1).isReadOnly());
|
||||
assertTrue(DB.beanState(ar1).isReadOnly());
|
||||
|
||||
List<Section> ar1sections = ar1.getSections();
|
||||
assertEquals(1, ar1sections.size());
|
||||
|
||||
Section s2 = ar1sections.get(0);
|
||||
assertTrue(DB.getBeanState(s2).isReadOnly());
|
||||
assertTrue(DB.beanState(s2).isReadOnly());
|
||||
|
||||
DB.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList();
|
||||
|
||||
Article ar0 = DB.find(Article.class, a0.getId());
|
||||
|
||||
assertNotNull(ar0);
|
||||
assertFalse(DB.getBeanState(ar0).isReadOnly());
|
||||
assertFalse(DB.beanState(ar0).isReadOnly());
|
||||
|
||||
List<Section> ar0sections = ar0.getSections();
|
||||
Section s1 = ar0sections.get(0);
|
||||
assertFalse(DB.getBeanState(s1).isReadOnly());
|
||||
assertFalse(DB.beanState(s1).isReadOnly());
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase {
|
||||
Customer c = custList.get(0);
|
||||
|
||||
List<Contact> contacts2 = c.getContacts();
|
||||
assertEquals(3, DB.getBeanState(c).getLoadedProps().size());
|
||||
assertEquals(3, DB.beanState(c).getLoadedProps().size());
|
||||
|
||||
// now lazy load the contacts
|
||||
contacts2.size();
|
||||
@@ -32,7 +32,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase {
|
||||
|
||||
// we only "loaded" the contacts BeanList and not all of c2
|
||||
List<Contact> contacts = c2.getContacts();
|
||||
// Set<String> loadedProps = DB.getBeanState(c2).getLoadedProps();
|
||||
// Set<String> loadedProps = DB.beanState(c2).getLoadedProps();
|
||||
// assertEquals(1, loadedProps.size());
|
||||
|
||||
// now lazy load the contacts
|
||||
|
||||
@@ -27,7 +27,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
|
||||
List<Customer> customers = query.findList();
|
||||
assertThat(customers).isNotEmpty();
|
||||
|
||||
BeanState beanState = DB.getBeanState(customers.get(0));
|
||||
BeanState beanState = DB.beanState(customers.get(0));
|
||||
assertThat(beanState.getLoadedProps()).contains("id", "name");
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
|
||||
List<Customer> customers = query.findList();
|
||||
assertThat(customers).isNotEmpty();
|
||||
|
||||
BeanState beanState = DB.getBeanState(customers.get(0));
|
||||
BeanState beanState = DB.beanState(customers.get(0));
|
||||
assertThat(beanState.getLoadedProps().size()).isGreaterThan(10);
|
||||
}
|
||||
|
||||
@@ -193,7 +193,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
|
||||
|
||||
assertThat(customers).isNotEmpty();
|
||||
|
||||
BeanState beanState = DB.getBeanState(customers.get(0));
|
||||
BeanState beanState = DB.beanState(customers.get(0));
|
||||
assertThat(beanState.getLoadedProps().size()).isGreaterThan(10);
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ public class TestNativeSqlBasic extends BaseTestCase {
|
||||
|
||||
assertThat(customers).isNotEmpty();
|
||||
|
||||
BeanState beanState = DB.getBeanState(customers.get(0));
|
||||
BeanState beanState = DB.beanState(customers.get(0));
|
||||
assertThat(beanState.getLoadedProps()).contains("id", "name");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase {
|
||||
assertEquals(Integer.valueOf(123), customer.getId());
|
||||
assertEquals("Hello rob", customer.getName());
|
||||
|
||||
BeanState beanState = DB.getBeanState(customer);
|
||||
BeanState beanState = DB.beanState(customer);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
|
||||
assertEquals(2, loadedProps.size());
|
||||
|
||||
@@ -32,7 +32,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
|
||||
|
||||
Product product = DB.getReference(Product.class, 1);
|
||||
|
||||
BeanState beanState0 = DB.getBeanState(product);
|
||||
BeanState beanState0 = DB.beanState(product);
|
||||
if (!beanState0.isReference()) {
|
||||
// got a cached value from beanCache
|
||||
|
||||
@@ -46,7 +46,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
|
||||
EntityBean eb = (EntityBean) refProd;
|
||||
prodDesc.isReference(eb._ebean_getIntercept());
|
||||
|
||||
BeanState beanState = DB.getBeanState(refProd);
|
||||
BeanState beanState = DB.beanState(refProd);
|
||||
assertTrue(beanState.isNew());
|
||||
|
||||
String name = refProd.getName();
|
||||
|
||||
@@ -37,7 +37,7 @@ public class TestBeanStateReset extends BaseTestCase {
|
||||
} catch (PersistenceException e) {
|
||||
logger.info("expected error " + e.getMessage());
|
||||
|
||||
DB.getBeanState(b).resetForInsert();
|
||||
DB.beanState(b).resetForInsert();
|
||||
b.getCs().clear();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
|
||||
@@ -31,7 +31,7 @@ public class TestFileTypeFetching extends BaseTestCase {
|
||||
.setId(bean0.getId())
|
||||
.findOne();
|
||||
|
||||
BeanState beanState = DB.getBeanState(bean1);
|
||||
BeanState beanState = DB.beanState(bean1);
|
||||
Set<String> loadedProps = beanState.getLoadedProps();
|
||||
assertTrue(loadedProps.contains("name"));
|
||||
assertFalse(loadedProps.contains("content"));
|
||||
|
||||
Reference in New Issue
Block a user