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/20 17:08:58 UTC
(jackrabbit) branch 2.20 updated: JCR-4967: test coverage for modification of non-versioned node with jcr:isCheckedOut==false property
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 2.20
in repository https://gitbox.apache.org/repos/asf/jackrabbit.git
The following commit(s) were added to refs/heads/2.20 by this push:
new f0d17001c JCR-4967: test coverage for modification of non-versioned node with jcr:isCheckedOut==false property
f0d17001c is described below
commit f0d17001cb9301970f42877f64ef0898d35b0f3a
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Dec 6 13:36:11 2023 +0000
JCR-4967: test coverage for modification of non-versioned node with jcr:isCheckedOut==false property
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1914385 13f79535-47bb-0310-9956-ffa450edef68
---
jackrabbit-core/pom.xml | 2 +
.../ModifyNonVersionableCheckedOutTest.java | 87 ++++++++++++++++++++++
.../apache/jackrabbit/core/version/TestAll.java | 1 +
3 files changed, 90 insertions(+)
diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
index e5deb4f63..6d69233ca 100644
--- a/jackrabbit-core/pom.xml
+++ b/jackrabbit-core/pom.xml
@@ -114,6 +114,8 @@ org.apache.jackrabbit.core.security.user.MembershipCachePerfTest <!-- don't run
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>
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java
new file mode 100755
index 000000000..3f32e144c
--- /dev/null
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/ModifyNonVersionableCheckedOutTest.java
@@ -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));
+ }
+}
diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
index f3f68009e..60fed324a 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
@@ -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;
}
}