cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r464098 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src: main/java/org/apache/cayenne/ test/java/org/apache/cayenne/ test/java/org/apache/cayenne/access/
Date Sun, 15 Oct 2006 02:13:35 GMT
Author: aadamchik
Date: Sat Oct 14 19:13:35 2006
New Revision: 464098

URL: http://svn.apache.org/viewvc?view=rev&rev=464098
Log:
CAY-692:  Extra argument needed in ObjectContext.prepareForAccess - whether the property is
a fault or not.
(removed deprecated method calls from unit tests; changed deprecated method to use "false"
for lazy faulting)

Modified:
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextTst.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java?view=diff&rev=464098&r1=464097&r2=464098
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
Sat Oct 14 19:13:35 2006
@@ -72,7 +72,7 @@
      *             {@link #prepareForAccess(Persistent, String, boolean)}.
      */
     public void prepareForAccess(Persistent object, String property) {
-        prepareForAccess(object, property, true);
+        prepareForAccess(object, property, false);
     }
 
     public abstract void prepareForAccess(

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextTst.java?view=diff&rev=464098&r1=464097&r2=464098
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextTst.java
Sat Oct 14 19:13:35 2006
@@ -320,7 +320,7 @@
         context.graphManager.registerNode(hollow.getObjectId(), hollow);
 
         // testing this...
-        context.prepareForAccess(hollow, ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY);
+        context.prepareForAccess(hollow, ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, false);
         assertTrue(selectExecuted[0]);
         assertSame(hollow, context.getGraphManager().getNode(gid));
         assertEquals(inflated.getGlobalAttribute1Direct(), hollow

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java?view=diff&rev=464098&r1=464097&r2=464098
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
Sat Oct 14 19:13:35 2006
@@ -79,7 +79,7 @@
         assertEquals(PersistenceState.HOLLOW, o1.getPersistenceState());
         assertNull(o1.readPropertyDirectly("artistName"));
 
-        context.prepareForAccess(o1, null);
+        context.prepareForAccess(o1, null, false);
         assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
         assertEquals("a", o1.readPropertyDirectly("artistName"));
     }
@@ -93,7 +93,7 @@
                 new Integer(234)), null);
 
         try {
-            context.prepareForAccess(o1, null);
+            context.prepareForAccess(o1, null, false);
             fail("Must blow on non-existing fault.");
         }
         catch (CayenneRuntimeException ex) {

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java?view=diff&rev=464098&r1=464097&r2=464098
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTst.java
Sat Oct 14 19:13:35 2006
@@ -639,7 +639,7 @@
         // in the second context
         final Artist altArtist = (Artist) altContext.getGraphManager().getNode(
                 artist.getObjectId());
-        altContext.prepareForAccess(altArtist, null);
+        altContext.prepareForAccess(altArtist, null, false);
         assertEquals(PersistenceState.COMMITTED, altArtist.getPersistenceState());
 
         context.invalidateObjects(Collections.singletonList(artist));

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java?view=diff&rev=464098&r1=464097&r2=464098
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/IdentityColumnsTst.java
Sat Oct 14 19:13:35 2006
@@ -84,7 +84,7 @@
                 m, d
         }));
 
-        context.prepareForAccess(d, null);
+        context.prepareForAccess(d, null, false);
 
         // this line caused CAY-422 error
         d.getToMaster();



Mime
View raw message