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 2005/04/26 10:10:11 UTC
svn commit: r164765 - in
/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version:
MergeNodeIteratorTest.java TestAll.java
Author: mreutegg
Date: Tue Apr 26 01:10:10 2005
New Revision: 164765
URL: http://svn.apache.org/viewcvs?rev=164765&view=rev
Log:
Add test case, contributed by Vinzenz Wyser.
Added:
incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java (with props)
Modified:
incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/TestAll.java
Added: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java?rev=164765&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java (added)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java Tue Apr 26 01:10:10 2005
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.test.api.version;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Node;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * <code>MergeNodeIteratorTest</code> tests if Node.merge(String, boolean) if
+ * bestEffort is true returns a NodeIterator over all versionalbe nodes in the
+ * subtree that received a merge result of fail.
+ *
+ * @test
+ * @sources MergeNodeIteratorTest.java
+ * @executeClass org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest
+ * @keywords versioning
+ */
+public class MergeNodeIteratorTest extends AbstractMergeTest {
+
+ Node expectedFailedNodes[] = new Node[3];
+
+ /**
+ * Tests if Node.merge() when bestEffort is true returns a NodeIterator
+ * containing all nodes that received a fail.
+ */
+ public void testNodeIterator() throws RepositoryException {
+
+ Node nodeToMerge = testRootNodeW2.getNode(nodeName1);
+
+ Iterator failedNodes = nodeToMerge.merge(workspace.getName(), true);
+
+ List nodeList = new ArrayList();
+ while (failedNodes.hasNext()) {
+ nodeList.add(failedNodes.next());
+ }
+
+ assertEquals("Node.merge() does not return a NodeIterator with " +
+ "expected number of elements.",
+ expectedFailedNodes.length,
+ nodeList.size());
+
+ // re-aquire iterator, has been consumed to get size
+ failedNodes = nodeList.iterator();
+ compareReturnedWithExpected:
+ while (failedNodes.hasNext()) {
+ String path = ((Node) failedNodes.next()).getPath();
+ for (int i = 0; i < expectedFailedNodes.length; i++) {
+ if (expectedFailedNodes[i] != null) {
+ String expectedPath = expectedFailedNodes[i].getPath();
+ if (path.equals(expectedPath)) {
+ // to assure every failed node appears only once in the
+ // NodeIterator, set each found expected node to null
+ expectedFailedNodes[i] = null;
+ continue compareReturnedWithExpected;
+ }
+ }
+ }
+ fail("Node.merge() must return a NodeIterator over all " +
+ "nodes that did receive a result of fail.");
+ }
+ }
+
+ /**
+ * initialize some versionable nodes on default and second workspace
+ */
+ protected void initNodes() throws RepositoryException {
+
+ // create some versionable node in default workspace (WS1)
+
+ Node mergeRootNode = testRootNode.addNode(nodeName1, versionableNodeType);
+
+ Node nodeWS1_1 = mergeRootNode.addNode(nodeName1, versionableNodeType);
+ Node nodeWS1_1Sub1 = nodeWS1_1.addNode(nodeName1, versionableNodeType);
+ Node nodeWS1_2 = mergeRootNode.addNode(nodeName2, versionableNodeType);
+ Node nodeWS1_2Sub1 = nodeWS1_2.addNode(nodeName1, versionableNodeType);
+ Node nodeWS1_3 = mergeRootNode.addNode(nodeName3, versionableNodeType);
+
+ testRootNode.save();
+
+ nodeWS1_1.checkin(); // create version 1.0
+ nodeWS1_1.checkout();
+
+ nodeWS1_1Sub1.checkin(); // create version 1.0
+ nodeWS1_1Sub1.checkout();
+
+ nodeWS1_2.checkin(); // create version 1.0
+ nodeWS1_2.checkout();
+
+ nodeWS1_2Sub1.checkin(); // create version 1.0
+ nodeWS1_2Sub1.checkout();
+
+ nodeWS1_3.checkin(); // create version 1.0
+ nodeWS1_3.checkout();
+
+
+ workspaceW2.clone(workspace.getName(), mergeRootNode.getPath(), mergeRootNode.getPath(), true);
+
+ // get nodes in workspace 2
+ Node nodeWS2_1 = (Node) superuserW2.getItem(nodeWS1_1.getPath());
+ Node nodeWS2_2 = (Node) superuserW2.getItem(nodeWS1_2.getPath());
+ Node nodeWS2_2Sub1 = (Node) superuserW2.getItem(nodeWS1_2Sub1.getPath());
+
+ // create version branches for some of the nodes
+
+ nodeWS2_1.checkin(); // create version 1.1
+ nodeWS1_1.checkin(); // create version 1.0.1
+
+ nodeWS2_2.checkin(); // create version 1.1
+ nodeWS1_2.checkin(); // create version 1.0.1
+
+ nodeWS2_2Sub1.checkin(); // create version 1.1
+ nodeWS1_2Sub1.checkin(); // create version 1.0.1
+
+ // set the nodes with version branches in expectedFailedNodes
+ expectedFailedNodes[0] = nodeWS1_1;
+ expectedFailedNodes[1] = nodeWS1_2;
+ expectedFailedNodes[2] = nodeWS1_2Sub1;
+ }
+
+}
\ No newline at end of file
Propchange: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/MergeNodeIteratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/TestAll.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/TestAll.java?rev=164765&r1=164764&r2=164765&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/TestAll.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/version/TestAll.java Tue Apr 26 01:10:10 2005
@@ -58,6 +58,7 @@
suite.addTestSuite(GetVersionableUUIDTest.class);
suite.addTestSuite(SessionMoveVersionExceptionTest.class);
suite.addTestSuite(WorkspaceMoveVersionExceptionTest.class);
+ suite.addTestSuite(MergeNodeIteratorTest.class);
return suite;
}