You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/02/22 11:28:19 UTC
svn commit: r1854134 - in /jackrabbit/oak/branches/1.10: ./
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Author: reschke
Date: Fri Feb 22 11:28:19 2019
New Revision: 1854134
URL: http://svn.apache.org/viewvc?rev=1854134&view=rev
Log:
OAK-8037: add test case for making a node type referenceable (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 22 11:28:19 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058
+/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java?rev=1854134&r1=1854133&r2=1854134&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java (original)
+++ jackrabbit/oak/branches/1.10/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java Fri Feb 22 11:28:19 2019
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.jcr.no
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.StringReader;
@@ -172,7 +173,7 @@ public class NodeTypeTest extends Abstra
pdt.add(opts);
ntt.add(nt);
}
-
+
logCustomizer = LogCustomizer.forLogger(TypeEditorProvider.class.getName()).enable(Level.INFO)
.contains("appear to be trivial, repository will not be scanned").create();
try {
@@ -350,4 +351,51 @@ public class NodeTypeTest extends Abstra
n.getProperty("test:mandatory").remove();
session.save();
}
+
+ @Test
+ public void addReferenceableToExistingType() throws Exception {
+ Session session = getAdminSession();
+ Node root = session.getRootNode();
+
+ // 1. Create node type that is not referencable
+ String cnd = "<'test'='http://www.apache.org/jackrabbit/test'> [test:AlmostReferenceable] > nt:base";
+ CndImporter.registerNodeTypes(new StringReader(cnd), session, false);
+
+ // 2. Create test node
+ Node newnode = root.addNode("testnode", "test:AlmostReferenceable");
+ session.save();
+
+ // 3. Attempt node type upgrade, adding optional jcr:uuid property
+ cnd = "<'test'='http://www.apache.org/jackrabbit/test'> [test:AlmostReferenceable] > nt:base - jcr:uuid (string)";
+ CndImporter.registerNodeTypes(new StringReader(cnd), session, true);
+
+ // 4. fill jcr:uuid
+ newnode = root.getNode("testnode");
+ String uuid = UUID.randomUUID().toString();
+ newnode.setProperty("jcr:uuid", uuid);
+ session.save();
+ // property is not a system property yet
+ assertFalse(newnode.getProperty("jcr:uuid").getDefinition().isAutoCreated());
+ assertFalse(newnode.getProperty("jcr:uuid").getDefinition().isProtected());
+
+ // 5. Attempt node type upgrade, making the type referencable
+ cnd = "<'test'='http://www.apache.org/jackrabbit/test'> [test:AlmostReferenceable] > mix:referenceable, nt:base";
+ CndImporter.registerNodeTypes(new StringReader(cnd), session, true);
+
+ // 6. new node should be referenceable and have jcr:uuid
+ newnode = root.getNode("testnode");
+ assertTrue(newnode.hasProperty("jcr:uuid"));
+ // property is now a system property
+ assertTrue(newnode.getProperty("jcr:uuid").getDefinition().isAutoCreated());
+ assertTrue(newnode.getProperty("jcr:uuid").getDefinition().isProtected());
+
+ // 7. try to reference the node
+ Node refnode = root.addNode("refnode", "nt:unstructured");
+ refnode.setProperty("refprop", newnode);
+ session.save();
+
+ // 8. get the node by UUID
+ Node found = session.getNodeByIdentifier(uuid);
+ assertTrue(found.isSame(newnode));
+ }
}