You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2023/12/06 13:36:11 UTC
svn commit: r1914385 - in /jackrabbit/trunk: jackrabbit-core/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/
Author: reschke
Date: Wed Dec 6 13:36:11 2023
New Revision: 1914385
URL: http://svn.apache.org/viewvc?rev=1914385&view=rev
Log:
JCR-4967: test coverage for modification of non-versioned node with jcr:isCheckedOut==false property
Added:
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java (with props)
Modified:
jackrabbit/trunk/jackrabbit-core/pom.xml
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/CopyOfAbstractLinkedList.java (props changed)
Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1914385&r1=1914384&r2=1914385&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Wed Dec 6 13:36:11 2023
@@ -114,6 +114,8 @@ org.apache.jackrabbit.core.security.user
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testStringLiteralInvalidName <!-- OAK-3265 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testPathLiteral <!-- OAK-3265 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral <!-- OAK-3265 -->
+org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testNonVersionableCheckedOut <!-- JCR-5007 -->
+org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModifyNonVersionableNodeWithCheckedOutProperty <!-- JCR-5007 -->
</value>
</property>
<property>
Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java?rev=1914385&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java Wed Dec 6 13:36:11 2023
@@ -0,0 +1,87 @@
+/*
+ * 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.version;
+
+import javax.jcr.Node;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+public class ModifyNonVersionableCheckedOutTest extends AbstractJCRTest {
+
+ public void testNonVersionableCheckedOut() throws Exception {
+ Node node = testRootNode.addNode(nodeName1, "nt:unstructured");
+ superuser.save();
+
+ assertTrue(node.isCheckedOut());
+
+ node.setProperty("jcr:isCheckedOut", false);
+ superuser.save();
+
+ assertTrue(node.getPath() + " does not have mix:versionable and thus should be reported as checked out",
+ node.isCheckedOut());
+ }
+
+ public void testModifyNonVersionableNodeWithCheckedOutProperty() throws Exception {
+ Node node = testRootNode.addNode(nodeName1, "nt:unstructured");
+ superuser.save();
+
+ assertTrue(node.isCheckedOut());
+
+ node.setProperty("jcr:isCheckedOut", false);
+ superuser.save();
+
+ node.setProperty("test", true);
+ superuser.save();
+
+ assertTrue(node.getProperty("test").getBoolean());
+
+ node.setProperty("test", false);
+ superuser.save();
+
+ assertFalse(node.getProperty("test").getBoolean());
+
+ node.getProperty("test").remove();
+ superuser.save();
+ assertFalse(node.hasProperty("test"));
+
+ node.addNode(nodeName2, "nt:unstructured");
+ superuser.save();
+
+ assertTrue(node.hasNode(nodeName2));
+
+ node.getNode(nodeName2).remove();
+ superuser.save();
+
+ assertFalse(node.hasNode(nodeName2));
+ }
+
+ public void testAddRemoveMixinVersionable() throws Exception {
+ Node node = testRootNode.addNode(nodeName1, "nt:unstructured");
+ node.addMixin(mixVersionable);
+ superuser.save();
+ node.checkin();
+ superuser.save();
+ assertFalse(node.isCheckedOut());
+ node.checkout();
+ superuser.save();
+ assertTrue(node.isCheckedOut());
+ node.removeMixin(mixVersionable);
+ superuser.save();
+ assertTrue(node.isCheckedOut());
+ assertFalse(node.hasProperty(jcrIsCheckedOut));
+ }
+}
Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java
------------------------------------------------------------------------------
svn:executable = *
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java?rev=1914385&r1=1914384&r2=1914385&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java Wed Dec 6 13:36:11 2023
@@ -39,6 +39,7 @@ public class TestAll extends TestCase {
suite.addTestSuite(RestoreTest.class);
suite.addTestSuite(RestoreNodeWithSNSTest.class);
suite.addTestSuite(VersionIteratorImplTest.class);
+ suite.addTestSuite(ModifyNonVersionableCheckedOutTest.class);
return suite;
}
}
Propchange: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/CopyOfAbstractLinkedList.java
------------------------------------------------------------------------------
svn:eol-style = native