From commits-return-3899-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Apr 13 13:39:28 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 54466 invoked from network); 13 Apr 2007 13:39:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Apr 2007 13:39:27 -0000 Received: (qmail 26593 invoked by uid 500); 13 Apr 2007 13:39:32 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 26565 invoked by uid 500); 13 Apr 2007 13:39:32 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 26556 invoked by uid 99); 13 Apr 2007 13:39:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2007 06:39:32 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2007 06:39:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id ED05F1A9838; Fri, 13 Apr 2007 06:39:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r528482 - /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java Date: Fri, 13 Apr 2007 13:39:05 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070413133905.ED05F1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri Apr 13 06:39:04 2007 New Revision: 528482 URL: http://svn.apache.org/viewvc?view=rev&rev=528482 Log: JCR-838: re-introduce changes from revision 527141 with fixes (properly handle property nodetype3 being absent, set mix:ref on the correct node) 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=528482&r1=528481&r2=528482 ============================================================================== --- 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:39:04 2007 @@ -266,9 +266,22 @@ public void testNode() throws NotExecutableException, RepositoryException { + String nodeType3 = getProperty("nodetype3"); + // create a referenceable node - Node referenceableNode = testRootNode.addNode(nodeName3); - referenceableNode.addMixin(mixReferenceable); + Node referenceableNode = (nodeType3 == null) + ? testRootNode.addNode(nodeName3) + : testRootNode.addNode(nodeName3, nodeType3); + + // try to make it referenceable if it is not + if (!referenceableNode.isNodeType(mixReferenceable)) { + if (referenceableNode.canAddMixin(mixReferenceable)) { + referenceableNode.addMixin(mixReferenceable); + } else { + throw new NotExecutableException("Failed to set up required test items."); + } + } + // implementation specific if mixin takes effect immediately or upon save testRootNode.save(); @@ -285,6 +298,9 @@ 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();