You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/11/06 01:54:58 UTC
svn commit: r471592 - in
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src:
main/java/org/apache/cayenne/CayenneContext.java
test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
Author: aadamchik
Date: Sun Nov 5 16:54:57 2006
New Revision: 471592
URL: http://svn.apache.org/viewvc?view=rev&rev=471592
Log:
CAY-701: property" package refactoring
(getting rid of "injectValueHolders" calls as value holders are resolved on demand anyways)
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java?view=diff&rev=471592&r1=471591&r2=471592
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java Sun Nov 5 16:54:57 2006
@@ -473,8 +473,6 @@
object.setObjectContext(this);
object.setPersistenceState(PersistenceState.NEW);
- descriptor.injectValueHolders(object);
-
synchronized (graphManager) {
graphManager.registerNode(object.getObjectId(), object);
graphManager.nodeCreated(object.getObjectId());
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java?view=diff&rev=471592&r1=471591&r2=471592
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java Sun Nov 5 16:54:57 2006
@@ -36,7 +36,6 @@
import org.apache.cayenne.unit.CayenneTestCase;
import org.apache.cayenne.unit.CayenneTestResources;
import org.apache.cayenne.unit.TestLocalConnection;
-import org.apache.cayenne.util.PersistentObjectHolder;
import org.apache.cayenne.util.PersistentObjectList;
public class CayenneContextWithDataContextTst extends CayenneTestCase {
@@ -47,28 +46,6 @@
.getAccessStack(MULTI_TIER_ACCESS_STACK);
}
- public void testNewObjectShouldInflateHolders() {
-
- CayenneContext context = new CayenneContext(new MockDataChannel());
- context.setEntityResolver(getDomain()
- .getEntityResolver()
- .getClientEntityResolver());
-
- // test that holders are present and that they are resolved... (new object has no
- // relationships by definition, so no need to keep holders as faults).
-
- // to one
- ClientMtTable2 o1 = (ClientMtTable2) context.newObject(ClientMtTable2.class);
- assertNotNull(o1.getTable1Direct());
- assertFalse(((PersistentObjectHolder) o1.getTable1Direct()).isFault());
-
- // to many
- ClientMtTable1 o2 = (ClientMtTable1) context.newObject(ClientMtTable1.class);
- assertNotNull(o2.getTable2ArrayDirect());
-
- assertFalse(((PersistentObjectList) o2.getTable2ArrayDirect()).isFault());
- }
-
public void testCreateFault() throws Exception {
createTestData("prepare");
@@ -104,7 +81,7 @@
public void testCreateBadFault() throws Exception {
deleteTestData();
createTestData("prepare");
-
+
// this clears domain cache
createDataContext();