svn commit: r577875 - /jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java

[ju...@apache.org]

Author: jukka
Date: Thu Sep 20 11:55:17 2007
New Revision: 577875

URL: http://svn.apache.org/viewvc?rev=577875&view=rev
Log:
1.3: Merged revision 575001 (JCR-1120)

Modified:
    jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java

Modified: jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java?rev=577875&r1=577874&r2=577875&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java Thu Sep 20 11:55:17 2007
@@ -22,6 +22,7 @@
 import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Node;
 import javax.jcr.ReferentialIntegrityException;
+import javax.jcr.Value;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionException;
 import javax.jcr.version.VersionHistory;
@@ -187,14 +188,16 @@
      * version is still referenced by another node.
      * @tck.config nodetype name of a node type that supports a reference
      *  property.
-     * @tck.config nodename2 name of the node created with <code>nodetype</code>.
+     * @tck.config nodename4 name of the node created with <code>nodetype</code>.
      * @tck.config propertyname1 a single value reference property available
      *  in <code>nodetype</code>.
      */
-    public void testReferentialIntegrityException() throws RepositoryException {
+    public void testReferentialIntegrityException() throws RepositoryException, NotExecutableException {
         // create reference: n1.p1 -> version
-        Node n1 = testRootNode.addNode(nodeName2, testNodeType);
-        n1.setProperty(propertyName1, superuser.getValueFactory().createValue(version));
+        Node n1 = testRootNode.addNode(nodeName4, testNodeType);
+        Value refValue = superuser.getValueFactory().createValue(version);
+        ensureCanSetProperty(n1, propertyName1, refValue);
+        n1.setProperty(propertyName1, refValue);
         testRootNode.save();
 
         try {