You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/03/13 06:16:51 UTC

svn commit: r385426 - /db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java

Author: clr
Date: Sun Mar 12 21:16:49 2006
New Revision: 385426

URL: http://svn.apache.org/viewcvs?rev=385426&view=rev
Log:
Fix DetachTest to reset DetachAllOnCommit flag

Modified:
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java?rev=385426&r1=385425&r2=385426&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java Sun Mar 12 21:16:49 2006
@@ -115,7 +115,7 @@
             Object expected, Object actual) {
         appendMessage(location + NL +
                 "expected: " + expected + NL +
-                "actual: " + actual);
+                "  actual: " + actual);
     }
 
     /** */
@@ -138,10 +138,11 @@
             CartEntry cartEntry = (CartEntry)cartEntries.next();
             checkState(location + "CartEntry instance", cartEntry,
                     persistent);
-            if (cartEntry.getCart() != cart) {
+            Cart cartEntryCart = cartEntry.getCart();
+            if (cartEntryCart != cart) {
                 reportDifference(location +
                         " incorrect value for cartEntry.cart",
-                        cart, cartEntry.getCart());
+                        cart, cartEntryCart);
             }
             if (goldenCartEntry.getId() != cartEntry.getId()) 
                 reportDifference(location + 
@@ -173,6 +174,7 @@
         checkCartValues(ASSERTION_FAILED + 
                 "after commit with DetachAllOnCommit,", cart1);
         failOnError();
+        pm.setDetachAllOnCommit(false);
         return cart1;
     }
 }