From commits-return-3820-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Mar 20 14:16:46 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 40097 invoked from network); 20 Mar 2007 14:16:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Mar 2007 14:16:44 -0000 Received: (qmail 20243 invoked by uid 500); 20 Mar 2007 14:16:52 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 20189 invoked by uid 500); 20 Mar 2007 14:16:52 -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 20179 invoked by uid 99); 20 Mar 2007 14:16:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2007 07:16:52 -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; Tue, 20 Mar 2007 07:16:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4628C1A9838; Tue, 20 Mar 2007 07:16:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r520400 - /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java Date: Tue, 20 Mar 2007 14:16:23 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070320141623.4628C1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Tue Mar 20 07:16:22 2007 New Revision: 520400 URL: http://svn.apache.org/viewvc?view=rev&rev=520400 Log: fix indentation Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java?view=diff&rev=520400&r1=520399&r2=520400 ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferencesTest.java Tue Mar 20 07:16:22 2007 @@ -35,132 +35,132 @@ */ public void testReferences() throws RepositoryException { Node n1 = testRootNode.addNode(nodeName1, testNodeType); - n1.addMixin(mixReferenceable); + n1.addMixin(mixReferenceable); // with some impls. the mixin type has only affect upon save testRootNode.save(); // create references: n2.p1 -> n1 - Node n2 = testRootNode.addNode(nodeName2, testNodeType); - Property p1 = n2.setProperty(propertyName1, new Value[]{superuser.getValueFactory().createValue(n1)}); - testRootNode.save(); - PropertyIterator iter = n1.getReferences(); - if (iter.hasNext()) { - assertEquals("Wrong referer", iter.nextProperty().getPath(), p1.getPath()); - } else { - fail("no referer"); - } - - // create references: n3.p1 -> n1 - Node n3 = testRootNode.addNode(nodeName3, testNodeType); - n3.setProperty(propertyName1, n1); - testRootNode.save(); - iter = n1.getReferences(); - while (iter.hasNext()) { - Property p = iter.nextProperty(); - if (n2 != null && p.getParent().getPath().equals(n2.getPath())) { - n2 = null; - } else if (n3 != null && p.getParent().getPath().equals(n3.getPath())) { - n3 = null; - } else { - fail("too many referers: " + p.getPath()); - } - } - if (n2 != null) { - fail("referer not in references set: " + n2.getPath()); - } - if (n3 != null) { - fail("referer not in references set: " + n3.getPath()); - } - - // remove reference n3.p1 -> n1 - testRootNode.getNode(nodeName3).getProperty(propertyName1).remove(); - testRootNode.save(); - iter = n1.getReferences(); - if (iter.hasNext()) { - assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), testRootNode.getNode(nodeName2).getPath()); - } else { - fail("no referer"); - } - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } - - // remove reference n2.p1 -> n1 - testRootNode.getNode(nodeName2).getProperty(propertyName1).setValue(new Value[0]); - testRootNode.save(); - iter = n1.getReferences(); - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } + Node n2 = testRootNode.addNode(nodeName2, testNodeType); + Property p1 = n2.setProperty(propertyName1, new Value[]{superuser.getValueFactory().createValue(n1)}); + testRootNode.save(); + PropertyIterator iter = n1.getReferences(); + if (iter.hasNext()) { + assertEquals("Wrong referer", iter.nextProperty().getPath(), p1.getPath()); + } else { + fail("no referer"); + } + + // create references: n3.p1 -> n1 + Node n3 = testRootNode.addNode(nodeName3, testNodeType); + n3.setProperty(propertyName1, n1); + testRootNode.save(); + iter = n1.getReferences(); + while (iter.hasNext()) { + Property p = iter.nextProperty(); + if (n2 != null && p.getParent().getPath().equals(n2.getPath())) { + n2 = null; + } else if (n3 != null && p.getParent().getPath().equals(n3.getPath())) { + n3 = null; + } else { + fail("too many referers: " + p.getPath()); + } + } + if (n2 != null) { + fail("referer not in references set: " + n2.getPath()); + } + if (n3 != null) { + fail("referer not in references set: " + n3.getPath()); + } + + // remove reference n3.p1 -> n1 + testRootNode.getNode(nodeName3).getProperty(propertyName1).remove(); + testRootNode.save(); + iter = n1.getReferences(); + if (iter.hasNext()) { + assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), testRootNode.getNode(nodeName2).getPath()); + } else { + fail("no referer"); + } + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } + + // remove reference n2.p1 -> n1 + testRootNode.getNode(nodeName2).getProperty(propertyName1).setValue(new Value[0]); + testRootNode.save(); + iter = n1.getReferences(); + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } } /** * Tests Property.getNode(); */ public void testReferenceTarget() throws RepositoryException { - Node n1 = testRootNode.addNode(nodeName1, testNodeType); - n1.addMixin(mixReferenceable); + Node n1 = testRootNode.addNode(nodeName1, testNodeType); + n1.addMixin(mixReferenceable); // with some impls. the mixin type has only affect upon save testRootNode.save(); // create references: n2.p1 -> n1 - Node n2 = testRootNode.addNode(nodeName2, testNodeType); - n2.setProperty(propertyName1, n1); - testRootNode.save(); - assertEquals("Wrong reference target.", n2.getProperty(propertyName1).getNode(), n1); - n2.remove(); - testRootNode.save(); + Node n2 = testRootNode.addNode(nodeName2, testNodeType); + n2.setProperty(propertyName1, n1); + testRootNode.save(); + assertEquals("Wrong reference target.", n2.getProperty(propertyName1).getNode(), n1); + n2.remove(); + testRootNode.save(); } /** * Tests changing a reference property */ public void testAlterReference() throws RepositoryException { - Node n1 = testRootNode.addNode(nodeName1, testNodeType); - n1.addMixin(mixReferenceable); - Node n2 = testRootNode.addNode(nodeName2, testNodeType); - n2.addMixin(mixReferenceable); + Node n1 = testRootNode.addNode(nodeName1, testNodeType); + n1.addMixin(mixReferenceable); + Node n2 = testRootNode.addNode(nodeName2, testNodeType); + n2.addMixin(mixReferenceable); // with some impls. the mixin type has only affect upon save testRootNode.save(); // create references: n3.p1 -> n1 - Node n3 = testRootNode.addNode(nodeName3, testNodeType); - n3.setProperty(propertyName1, n1); - testRootNode.save(); - assertEquals("Wrong reference target.", n3.getProperty(propertyName1).getNode(), n1); - PropertyIterator iter = n1.getReferences(); - if (iter.hasNext()) { - assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), n3.getPath()); - } else { - fail("no referer"); - } - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } - // change reference: n3.p1 -> n2 - n3.setProperty(propertyName1, n2); - n3.save(); - assertEquals("Wrong reference target.", n3.getProperty(propertyName1).getNode(), n2); - iter = n1.getReferences(); - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } - iter = n2.getReferences(); - if (iter.hasNext()) { - assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), n3.getPath()); - } else { - fail("no referers"); - } - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } - - // clear reference by overwriting by other type - n3.setProperty(propertyName1, "Hello, world."); - n3.save(); - iter = n2.getReferences(); - if (iter.hasNext()) { - fail("too many referers: " + iter.nextProperty().getPath()); - } + Node n3 = testRootNode.addNode(nodeName3, testNodeType); + n3.setProperty(propertyName1, n1); + testRootNode.save(); + assertEquals("Wrong reference target.", n3.getProperty(propertyName1).getNode(), n1); + PropertyIterator iter = n1.getReferences(); + if (iter.hasNext()) { + assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), n3.getPath()); + } else { + fail("no referer"); + } + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } + // change reference: n3.p1 -> n2 + n3.setProperty(propertyName1, n2); + n3.save(); + assertEquals("Wrong reference target.", n3.getProperty(propertyName1).getNode(), n2); + iter = n1.getReferences(); + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } + iter = n2.getReferences(); + if (iter.hasNext()) { + assertEquals("Wrong referer", iter.nextProperty().getParent().getPath(), n3.getPath()); + } else { + fail("no referers"); + } + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } + + // clear reference by overwriting by other type + n3.setProperty(propertyName1, "Hello, world."); + n3.save(); + iter = n2.getReferences(); + if (iter.hasNext()) { + fail("too many referers: " + iter.nextProperty().getPath()); + } } }