You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2007/02/16 18:00:38 UTC

svn commit: r508492 - in /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api: ./ observation/

Author: mreutegg
Date: Fri Feb 16 09:00:37 2007
New Revision: 508492

URL: http://svn.apache.org/viewvc?view=rev&rev=508492
Log:
JCR-745: TCK: more tests assuming that 'addMixin' immediately taking effect

Modified:
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyAssumeTypeTest.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueConstraintViolationExceptionTest.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueValueFormatExceptionTest.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyAssumeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyAssumeTypeTest.java?view=diff&rev=508492&r1=508491&r2=508492
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyAssumeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetPropertyAssumeTypeTest.java Fri Feb 16 09:00:37 2007
@@ -352,6 +352,8 @@
 
         Node referenceableNode = testRootNode.addNode(nodeName2);
         referenceableNode.addMixin(mixReferenceable);
+        // some implementations may require a save after addMixin()
+        testRootNode.save();
 
         Property prop = testNode.setProperty(testPropName, referenceableNode);
         assertEquals("setProperty(String, Value) of a property of type undefined " +
@@ -554,4 +556,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueConstraintViolationExceptionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueConstraintViolationExceptionTest.java?view=diff&rev=508492&r1=508491&r2=508492
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueConstraintViolationExceptionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueConstraintViolationExceptionTest.java Fri Feb 16 09:00:37 2007
@@ -448,6 +448,9 @@
             nodeNotSatisfied = testRootNode.addNode(nodeName4, nodeTypeNotSatisfied);
             nodeNotSatisfied.addMixin(mixReferenceable);
 
+            // some implementations may require a save after addMixin()
+            testRootNode.save();
+
             prop = node.setProperty(propDef.getName(), nodeSatisfied);
             testRootNode.save();
         } catch (ConstraintViolationException e) {
@@ -812,12 +815,15 @@
             // create a referenceable node satisfying the constraint
             nodeSatisfied = testRootNode.addNode(nodeName3, nodeTypeSatisfied);
             nodeSatisfied.addMixin(mixReferenceable);
-            Value valueSatisfied = superuser.getValueFactory().createValue(nodeSatisfied);
 
             // create a referenceable node not satisfying the constraint
             nodeNotSatisfied = testRootNode.addNode(nodeName4, nodeTypeNotSatisfied);
             nodeNotSatisfied.addMixin(mixReferenceable);
+            
+            // some implementations may require a save after addMixin()
+            testRootNode.save();
 
+            Value valueSatisfied = superuser.getValueFactory().createValue(nodeSatisfied);
             prop = node.setProperty(propDef.getName(), new Value[]{valueSatisfied});
             testRootNode.save();
         } catch (ConstraintViolationException e) {
@@ -838,4 +844,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueValueFormatExceptionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueValueFormatExceptionTest.java?view=diff&rev=508492&r1=508491&r2=508492
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueValueFormatExceptionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueValueFormatExceptionTest.java Fri Feb 16 09:00:37 2007
@@ -212,6 +212,8 @@
         try {
             Node referenceableNode = testRootNode.addNode(nodeName3);
             referenceableNode.addMixin(mixReferenceable);
+            // some implementations may require a save after addMixin()
+            testRootNode.save();
 
             booleanProperty.setValue(referenceableNode);
             fail("Property.setValue(Node) must throw a ValueFormatException " +
@@ -261,6 +263,8 @@
                 throw new NotExecutableException(testNodeType + " does not support adding of mix:referenceable");
             } else {
                 n.addMixin(mixReferenceable);
+                // some implementations may require a save after addMixin()
+                testRootNode.save();
             }
         }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java?view=diff&rev=508492&r1=508491&r2=508492
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java Fri Feb 16 09:00:37 2007
@@ -234,7 +234,10 @@
             // the UUID during serialization.
             if (!referenceable.isNodeType(mixReferenceable)) {
                 referenceable.addMixin(mixReferenceable);
+                // some implementations may require a save after addMixin()                
+                session.save();
             }
+
             pt.setProperty(sc.referenceTestProperty, referenceable);
 
             // Create a boolean property on the root node, so I can test noRecurse and skipBinary at the same time
@@ -593,4 +596,4 @@
             return true;
         }
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java?view=diff&rev=508492&r1=508491&r2=508492
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java Fri Feb 16 09:00:37 2007
@@ -191,7 +191,9 @@
         Node n = testRootNode.addNode(nodeName, nodeType);
         if (!n.isNodeType(mixReferenceable)) {
             n.addMixin(mixReferenceable);
+            // some implementations may require a save after addMixin()
+            testRootNode.save();
         }
         return n;
     }
-}
\ No newline at end of file
+}