jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r703888 - in /jackrabbit/trunk: ./ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
Date Sun, 12 Oct 2008 21:56:16 GMT
Author: jukka
Date: Sun Oct 12 14:56:16 2008
New Revision: 703888

URL: http://svn.apache.org/viewvc?rev=703888&view=rev
Log:
JCR-1420: Add test for Node.restore() may throw InvalidStateException

Merged test case from revision 631261 of JCR-1399

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
  (contents, props changed)
      - copied, changed from r631261, jackrabbit/branches/1.3/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
Modified:
    jackrabbit/trunk/   (props changed)
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java

Propchange: jackrabbit/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /jackrabbit/branches/1.3:631261

Copied: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
(from r631261, jackrabbit/branches/1.3/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java?p2=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java&p1=jackrabbit/branches/1.3/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java&r1=631261&r2=703888&rev=703888&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
Sun Oct 12 14:56:16 2008
@@ -1,69 +1,69 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.core;
-
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.jackrabbit.test.AbstractJCRTest;
-
-/**
- * <code>RestoreAndCheckoutTest</code> tests for JCR-1197
- * "Node.restore() may throw InvalidItemStateException".
- *
- */
-public class RestoreAndCheckoutTest extends AbstractJCRTest {
-
-	private static final int NODES_COUNT = 10;
-
-	public void testRestoreAndCheckout() throws RepositoryException {
-		Session session = helper.getSuperuserSession();
-		
-		Node rootNode = session.getRootNode();
-		Node myRoot = rootNode.addNode("myRoot");
-		myRoot.addMixin("mix:versionable");
-		rootNode.save();
-		myRoot.checkin();
-
-		// create n child and grandchild versionable nodes
-		for (int i = 0; i < NODES_COUNT; i++) {
-			myRoot.checkout();
-			Node childNode = myRoot.addNode("child" + i);
-			childNode.addMixin("mix:versionable");
-			Node grandChildNode = childNode.addNode("grandChild");
-			grandChildNode.addMixin("mix:versionable");
-			myRoot.save();
-			grandChildNode.checkin();
-			childNode.checkin();
-			myRoot.checkin();
-		}
-
-		// restore child, then restore/checkout grandchild nodes
-		for (int i = 0; i < NODES_COUNT; i++) {
-			Node childNode = myRoot.getNode("child" + i);
-			childNode.restore("1.0", false);
-			Node grandChildNode = childNode.getNode("grandChild");
-			grandChildNode.restore("1.0", false);
-			// critical location regarding item state manager caching (see JCR-1197)
-			grandChildNode.checkout();
-			grandChildNode.checkin();
-		}
-
-		session.logout();
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.core;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+/**
+ * <code>RestoreAndCheckoutTest</code> tests for JCR-1197
+ * "Node.restore() may throw InvalidItemStateException".
+ *
+ */
+public class RestoreAndCheckoutTest extends AbstractJCRTest {
+
+	private static final int NODES_COUNT = 10;
+
+	public void testRestoreAndCheckout() throws RepositoryException {
+		Session session = helper.getSuperuserSession();
+		
+		Node rootNode = session.getRootNode();
+		Node myRoot = rootNode.addNode("myRoot");
+		myRoot.addMixin("mix:versionable");
+		rootNode.save();
+		myRoot.checkin();
+
+		// create n child and grandchild versionable nodes
+		for (int i = 0; i < NODES_COUNT; i++) {
+			myRoot.checkout();
+			Node childNode = myRoot.addNode("child" + i);
+			childNode.addMixin("mix:versionable");
+			Node grandChildNode = childNode.addNode("grandChild");
+			grandChildNode.addMixin("mix:versionable");
+			myRoot.save();
+			grandChildNode.checkin();
+			childNode.checkin();
+			myRoot.checkin();
+		}
+
+		// restore child, then restore/checkout grandchild nodes
+		for (int i = 0; i < NODES_COUNT; i++) {
+			Node childNode = myRoot.getNode("child" + i);
+			childNode.restore("1.0", false);
+			Node grandChildNode = childNode.getNode("grandChild");
+			grandChildNode.restore("1.0", false);
+			// critical location regarding item state manager caching (see JCR-1197)
+			grandChildNode.checkout();
+			grandChildNode.checkin();
+		}
+
+		session.logout();
+	}
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java?rev=703888&r1=703887&r2=703888&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
Sun Oct 12 14:56:16 2008
@@ -36,6 +36,7 @@
         suite.addTestSuite(ShareableNodeTest.class);
         suite.addTestSuite(TransientRepositoryTest.class);
         suite.addTestSuite(XATest.class);
+        suite.addTestSuite(RestoreAndCheckoutTest.class);
 
         return suite;
     }



Mime
View raw message