You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/04/13 15:13:51 UTC

svn commit: r528478 - /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java

Author: reschke
Date: Fri Apr 13 06:13:50 2007
New Revision: 528478

URL: http://svn.apache.org/viewvc?view=rev&rev=528478
Log:
JCR-838: undo change done in revision 527141; needs more investigation.

Modified:
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java?view=diff&rev=528478&r1=528477&r2=528478
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java Fri Apr 13 06:13:50 2007
@@ -266,20 +266,9 @@
     public void testNode()
         throws NotExecutableException, RepositoryException {
 
-        String nodeType3 = getProperty("nodetype3");
-
         // create a referenceable node
-        Node referenceableNode = testRootNode.addNode(nodeName3, nodeType3);
-
-        // try to make it referenceable if it is not
-        if (!node.isNodeType(mixReferenceable)) {
-            if (node.canAddMixin(mixReferenceable)) {
-                node.addMixin(mixReferenceable);
-            } else {
-                throw new NotExecutableException("Failed to set up required test items.");
-            }
-        }
-
+        Node referenceableNode = testRootNode.addNode(nodeName3);
+        referenceableNode.addMixin(mixReferenceable);
         // implementation specific if mixin takes effect immediately or upon save
         testRootNode.save();
 
@@ -296,9 +285,6 @@
                 throw new NotExecutableException("Failed to set up required test items.");
             }
         }
-
-        // fail early when reference properties are not suppoerted
-        ensureCanSetProperty(node, refPropName, node.getSession().getValueFactory().createValue(referenceableNode));
 
         Property property = node.setProperty(refPropName, referenceableNode);
         testRootNode.save();