Author: aadamchik
Date: Sun Jan 22 07:07:26 2012
New Revision: 1234454
URL: http://svn.apache.org/viewvc?rev=1234454&view=rev
Log:
CAY-1616 Remove internal dependencies on deprecated ObjectContext.localObject
migrating unit tests
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneDep2OneTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneDep2OneTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneDep2OneTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneDep2OneTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneDep2OneTest.java
Sun Jan 22 07:07:26 2012
@@ -85,11 +85,6 @@ public class CDOOneDep2OneTest extends C
public void testReplace() throws Exception {
String altPaintingName = "alt painting";
- Artist a1 = newArtist();
- assertEquals(a1.getObjectId(), context
- .localObject(a1.getObjectId(), null)
- .getObjectId());
-
PaintingInfo pi1 = newPaintingInfo();
Painting p1 = newPainting();
p1.setPaintingTitle(altPaintingName);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
Sun Jan 22 07:07:26 2012
@@ -37,7 +37,7 @@ import org.apache.cayenne.unit.di.server
* Tests peer context synchronization via ClientChannel events.
*/
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
-@ClientRuntimeProperty( {
+@ClientRuntimeProperty({
ClientModule.CHANNEL_EVENTS, "true"
})
public class CayenneContextClientChannelEventsTest extends ClientCase {
@@ -320,8 +320,8 @@ public class CayenneContextClientChannel
ClientMtTable5 o1r = c1.newObject(ClientMtTable5.class);
c1.commitChanges();
- ClientMtTable4 o2 = (ClientMtTable4) c2.localObject(o1.getObjectId(),
null);
- ClientMtTable5 o2r = (ClientMtTable5)
c2.localObject(o1r.getObjectId(), null);
+ ClientMtTable4 o2 = c2.localObject(o1);
+ ClientMtTable5 o2r = c2.localObject(o1r);
o2.addToTable5s(o2r);
c2.commitChanges();
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
Sun Jan 22 07:07:26 2012
@@ -27,7 +27,6 @@ import org.apache.cayenne.Cayenne;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataObject;
import org.apache.cayenne.DataRow;
-import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
@@ -51,14 +50,14 @@ import org.apache.cayenne.unit.di.server
public class DataContextExtrasTest extends ServerCase {
@Inject
- protected ObjectContext context;
+ protected DataContext context;
@Inject
protected DBHelper dbHelper;
@Inject
protected JdbcEventLogger logger;
-
+
@Inject
protected AdhocObjectFactory objectFactory;
@@ -143,10 +142,10 @@ public class DataContextExtrasTest exten
public void testResolveFaultFailure() {
- Persistent o1 = context.localObject(new ObjectId(
+ Persistent o1 = context.findOrCreateObject(new ObjectId(
"Artist",
Artist.ARTIST_ID_PK_COLUMN,
- new Integer(234)), null);
+ 234));
try {
context.prepareForAccess(o1, null, false);
@@ -168,7 +167,6 @@ public class DataContextExtrasTest exten
public void testHasChangesNew() {
- DataContext context = (DataContext) this.context;
assertTrue("No changes expected in context", !context.hasChanges());
context.newObject("Artist");
assertTrue(
@@ -178,7 +176,7 @@ public class DataContextExtrasTest exten
public void testNewObject() {
- Artist a1 = (Artist) ((DataContext) context).newObject("Artist");
+ Artist a1 = (Artist) context.newObject("Artist");
assertTrue(context.getGraphManager().registeredNodes().contains(a1));
assertTrue(context.newObjects().contains(a1));
}
@@ -192,7 +190,6 @@ public class DataContextExtrasTest exten
public void testIdObjectFromDataRow() {
- DataContext context = (DataContext) this.context;
DataRow row = new DataRow(10);
row.put("ARTIST_ID", new Integer(100000));
DataObject obj = context.objectFromDataRow(Artist.class, row);
@@ -205,7 +202,6 @@ public class DataContextExtrasTest exten
public void testPartialObjectFromDataRow() {
- DataContext context = (DataContext) this.context;
DataRow row = new DataRow(10);
row.put("ARTIST_ID", new Integer(100001));
row.put("ARTIST_NAME", "ArtistXYZ");
@@ -218,7 +214,6 @@ public class DataContextExtrasTest exten
public void testFullObjectFromDataRow() {
- DataContext context = (DataContext) this.context;
DataRow row = new DataRow(10);
row.put("ARTIST_ID", new Integer(123456));
row.put("ARTIST_NAME", "ArtistXYZ");
@@ -233,13 +228,12 @@ public class DataContextExtrasTest exten
public void testCommitChangesError() {
- DataContext context = (DataContext) this.context;
DataDomain domain = context.getParentDataDomain();
// setup mockup PK generator that will blow on PK request
// to emulate an exception
JdbcAdapter jdbcAdapter = objectFactory.newInstance(
- JdbcAdapter.class,
+ JdbcAdapter.class,
JdbcAdapter.class.getName());
PkGenerator newGenerator = new JdbcPkGenerator(jdbcAdapter) {
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
Sun Jan 22 07:07:26 2012
@@ -142,9 +142,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
- assertNotNull(altArtist);
+ final Artist altArtist = context1.localObject(artist);
assertFalse(altArtist == artist);
assertEquals(originalName, altArtist.getArtistName());
assertEquals(PersistenceState.COMMITTED,
altArtist.getPersistenceState());
@@ -190,8 +188,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
assertNotNull(altArtist);
assertFalse(altArtist == artist);
assertEquals(originalName, altArtist.getArtistName());
@@ -235,8 +232,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
assertNotNull(altArtist);
assertFalse(altArtist == artist);
assertEquals(artist.getArtistName(), altArtist.getArtistName());
@@ -247,8 +243,10 @@ public class DataContextSharedCacheTest
context.commitChanges();
// check underlying cache
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- altArtist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(altArtist.getObjectId()));
// check peer artist
ThreadedTestHelper helper = new ThreadedTestHelper() {
@@ -271,8 +269,7 @@ public class DataContextSharedCacheTest
*/
public void testSnapshotDeletePropagationToHollow() throws Exception {
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
assertNotNull(altArtist);
assertFalse(altArtist == artist);
@@ -283,8 +280,10 @@ public class DataContextSharedCacheTest
context.commitChanges();
// check underlying cache
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- altArtist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(altArtist.getObjectId()));
// check peer artist
ThreadedTestHelper helper = new ThreadedTestHelper() {
@@ -307,8 +306,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
altArtist.getArtistName();
assertNotNull(altArtist);
assertFalse(altArtist == artist);
@@ -322,8 +320,10 @@ public class DataContextSharedCacheTest
context.commitChanges();
// check underlying cache
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- altArtist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(altArtist.getObjectId()));
// check peer artist
ThreadedTestHelper helper = new ThreadedTestHelper() {
@@ -358,8 +358,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
altArtist.getArtistName();
assertNotNull(altArtist);
assertFalse(altArtist == artist);
@@ -372,8 +371,10 @@ public class DataContextSharedCacheTest
context.commitChanges();
// check underlying cache
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- altArtist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(altArtist.getObjectId()));
// check peer artist
ThreadedTestHelper helper = new ThreadedTestHelper() {
@@ -410,12 +411,9 @@ public class DataContextSharedCacheTest
// objects
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
- final Painting altPainting1 = (Painting) context1.localObject(painting1
- .getObjectId(), null);
- final Painting altPainting2 = (Painting) context1.localObject(painting2
- .getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
+ final Painting altPainting1 = context1.localObject(painting1);
+ final Painting altPainting2 = context1.localObject(painting2);
assertEquals(artist.getArtistName(), altArtist.getArtistName());
assertEquals(painting1.getPaintingTitle(),
altPainting1.getPaintingTitle());
@@ -437,16 +435,19 @@ public class DataContextSharedCacheTest
context.commitChanges();
// check underlying cache
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- painting1.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(painting1.getObjectId()));
// check peer artist
ThreadedTestHelper helper = new ThreadedTestHelper() {
@Override
protected void assertResult() throws Exception {
- assertEquals(PersistenceState.TRANSIENT, altPainting1
- .getPersistenceState());
+ assertEquals(
+ PersistenceState.TRANSIENT,
+ altPainting1.getPersistenceState());
assertEquals(PersistenceState.COMMITTED,
altArtist.getPersistenceState());
Collection<Painting> list = altArtist.getPaintingArray();
@@ -476,10 +477,8 @@ public class DataContextSharedCacheTest
// objects
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
- final Painting altPainting1 = (Painting) context1.localObject(painting1
- .getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
+ final Painting altPainting1 = context1.localObject(painting1);
assertEquals(artist.getArtistName(), altArtist.getArtistName());
assertEquals(painting1.getPaintingTitle(),
altPainting1.getPaintingTitle());
@@ -563,8 +562,10 @@ public class DataContextSharedCacheTest
context.invalidateObjects(artist);
assertEquals(PersistenceState.HOLLOW, artist.getPersistenceState());
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- artist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(artist.getObjectId()));
// resolve object
assertEquals(originalName, artist.getArtistName());
@@ -581,8 +582,7 @@ public class DataContextSharedCacheTest
// make sure we have a fully resolved copy of an artist object
// in the second context
- final Artist altArtist = (Artist) context1
- .localObject(artist.getObjectId(), null);
+ final Artist altArtist = context1.localObject(artist);
context1.prepareForAccess(altArtist, null, false);
assertEquals(PersistenceState.COMMITTED,
altArtist.getPersistenceState());
@@ -590,8 +590,10 @@ public class DataContextSharedCacheTest
// original context
assertEquals(PersistenceState.HOLLOW, artist.getPersistenceState());
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- artist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(artist.getObjectId()));
// alternate context
new ThreadedTestHelper() {
@@ -599,8 +601,10 @@ public class DataContextSharedCacheTest
@Override
protected void assertResult() throws Exception {
assertEquals(PersistenceState.HOLLOW,
altArtist.getPersistenceState());
-
assertNull(context1.getObjectStore().getDataRowCache().getCachedSnapshot(
- altArtist.getObjectId()));
+ assertNull(context1
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(altArtist.getObjectId()));
}
}.assertWithTimeout(5000);
@@ -621,8 +625,10 @@ public class DataContextSharedCacheTest
assertEquals(PersistenceState.COMMITTED, artist.getPersistenceState());
context.getObjectStore().getDataRowCache().forgetSnapshot(artist.getObjectId());
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- artist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(artist.getObjectId()));
// modify object and try to save
artist.setArtistName(newName);
@@ -646,8 +652,10 @@ public class DataContextSharedCacheTest
artist.setArtistName(newName);
context.getObjectStore().getDataRowCache().forgetSnapshot(artist.getObjectId());
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- artist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(artist.getObjectId()));
context.commitChanges();
@@ -671,8 +679,10 @@ public class DataContextSharedCacheTest
artist.setArtistName(newName);
context.getObjectStore().getDataRowCache().forgetSnapshot(artist.getObjectId());
-
assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(
- artist.getObjectId()));
+ assertNull(context
+ .getObjectStore()
+ .getDataRowCache()
+ .getCachedSnapshot(artist.getObjectId()));
// now replace the row in the database
String template = "UPDATE ARTIST SET ARTIST_NAME = #bind($newName)
WHERE ARTIST_NAME = #bind($oldName)";
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
Sun Jan 22 07:07:26 2012
@@ -215,7 +215,7 @@ public class DataDomainCallbacksTest ext
listener,
"publicCallback");
- Artist a2 = (Artist) context1.localObject(a1.getObjectId(), null);
+ Artist a2 = context1.localObject(a1);
assertEquals(PersistenceState.HOLLOW, a2.getPersistenceState());
assertEquals(0, a2.getPostLoaded());
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java?rev=1234454&r1=1234453&r2=1234454&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
Sun Jan 22 07:07:26 2012
@@ -31,8 +31,8 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
+import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.test.jdbc.DBHelper;
@@ -48,6 +48,9 @@ import org.apache.cayenne.unit.di.server
public class NestedDataContextReadTest extends ServerCase {
@Inject
+ private ServerRuntime runtime;
+
+ @Inject
private DataContext context;
@Inject
@@ -111,7 +114,7 @@ public class NestedDataContextReadTest e
public void testCreateChildDataContext() {
context.setValidatingObjectsOnCommit(true);
- ObjectContext child1 = context.createChildContext();
+ ObjectContext child1 = runtime.getContext(context);
assertNotNull(child1);
assertSame(context, child1.getChannel());
@@ -119,7 +122,7 @@ public class NestedDataContextReadTest e
context.setValidatingObjectsOnCommit(false);
- ObjectContext child2 = context.createChildContext();
+ ObjectContext child2 = runtime.getContext(context);
assertNotNull(child2);
assertSame(context, child2.getChannel());
@@ -136,33 +139,21 @@ public class NestedDataContextReadTest e
public void testSelect() throws Exception {
createArtistsDataSet();
- ObjectContext child = context.createChildContext();
+ ObjectContext child = runtime.getContext(context);
// test how different object states appear in the child on select
Persistent _new = context.newObject(Artist.class);
- Persistent hollow = context.localObject(new ObjectId(
- "Artist",
- Artist.ARTIST_ID_PK_COLUMN,
- 33001), null);
- DataObject committed = (DataObject) Cayenne.objectForQuery(
- context,
- new ObjectIdQuery(new ObjectId(
- "Artist",
- Artist.ARTIST_ID_PK_COLUMN,
- 33002)));
-
- int modifiedId = 33003;
- Artist modified = (Artist) Cayenne.objectForQuery(context, new
ObjectIdQuery(
- new ObjectId("Artist", Artist.ARTIST_ID_PK_COLUMN,
modifiedId)));
+ Persistent hollow = Cayenne.objectForPK(context, Artist.class, 33001);
+ context.invalidateObjects(hollow);
+
+ DataObject committed = Cayenne.objectForPK(context, Artist.class,
33002);
+
+ Artist modified = Cayenne.objectForPK(context, Artist.class, 33003);
modified.setArtistName("MODDED");
- DataObject deleted = (DataObject) Cayenne.objectForQuery(
- context,
- new ObjectIdQuery(new ObjectId(
- "Artist",
- Artist.ARTIST_ID_PK_COLUMN,
- 33004)));
+
+ DataObject deleted = Cayenne.objectForPK(context, Artist.class, 33004);
context.deleteObjects(deleted);
assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
@@ -180,7 +171,7 @@ public class NestedDataContextReadTest e
assertEquals(PersistenceState.COMMITTED,
next.getPersistenceState());
int id = Cayenne.intPKForObject(next);
- if (id == modifiedId) {
+ if (id == 33003) {
assertEquals("MODDED",
next.readProperty(Artist.ARTIST_NAME_PROPERTY));
}
}
@@ -189,48 +180,30 @@ public class NestedDataContextReadTest e
public void testReadToOneRelationship() throws Exception {
createRelationshipDataSet();
- final ObjectContext child = context.createChildContext();
+ final ObjectContext child = runtime.getContext(context);
// test how different object states appear in the child on select
- int hollowTargetSrcId = 33001;
- int modifiedTargetSrcId = 33002;
- int deletedTargetSrcId = 33003;
- int committedTargetSrcId = 33004;
- int newTargetSrcId = 33005;
-
- Painting hollowTargetSrc = Cayenne.objectForPK(
- context,
- Painting.class,
- hollowTargetSrcId);
+ Painting hollowTargetSrc = Cayenne.objectForPK(context,
Painting.class, 33001);
Artist hollowTarget = hollowTargetSrc.getToArtist();
- Painting modifiedTargetSrc = Cayenne.objectForPK(
- context,
- Painting.class,
- modifiedTargetSrcId);
+ Painting modifiedTargetSrc = Cayenne.objectForPK(context,
Painting.class, 33002);
Artist modifiedTarget = modifiedTargetSrc.getToArtist();
modifiedTarget.setArtistName("M1");
final Painting deletedTargetSrc = Cayenne.objectForPK(
context,
Painting.class,
- deletedTargetSrcId);
+ 33003);
Artist deletedTarget = deletedTargetSrc.getToArtist();
deletedTargetSrc.setToArtist(null);
context.deleteObjects(deletedTarget);
- Painting committedTargetSrc = Cayenne.objectForPK(
- context,
- Painting.class,
- committedTargetSrcId);
+ Painting committedTargetSrc = Cayenne.objectForPK(context,
Painting.class, 33004);
Artist committedTarget = committedTargetSrc.getToArtist();
committedTarget.getArtistName();
- final Painting newTargetSrc = Cayenne.objectForPK(
- context,
- Painting.class,
- newTargetSrcId);
+ final Painting newTargetSrc = Cayenne.objectForPK(context,
Painting.class, 33005);
Artist newTarget = context.newObject(Artist.class);
newTarget.setArtistName("N1");
newTargetSrc.setToArtist(newTarget);
@@ -306,7 +279,7 @@ public class NestedDataContextReadTest e
public void testPrefetchingToOne() throws Exception {
createPrefetchingDataSet();
- final ObjectContext child = context.createChildContext();
+ final ObjectContext child = runtime.getContext(context);
final ObjectId prefetchedId = new ObjectId(
"Artist",
@@ -344,7 +317,7 @@ public class NestedDataContextReadTest e
public void testPrefetchingToMany() throws Exception {
createPrefetchingDataSet();
- final ObjectContext child = context.createChildContext();
+ final ObjectContext child = runtime.getContext(context);
SelectQuery q = new SelectQuery(Artist.class);
q.addOrdering(Artist.ARTIST_NAME_PROPERTY, SortOrder.ASCENDING);
@@ -384,7 +357,7 @@ public class NestedDataContextReadTest e
public void testObjectFromDataRow() throws Exception {
- DataContext childContext = (DataContext) context.createChildContext();
+ DataContext childContext = (DataContext) runtime.getContext(context);
DataRow row = new DataRow(8);
row.put("ARTIST_ID", 5l);
