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/08 17:42:25 UTC
svn commit: r1853229 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Author: reschke
Date: Fri Feb 8 17:42:24 2019
New Revision: 1853229
URL: http://svn.apache.org/viewvc?rev=1853229&view=rev
Log:
OAK-8037: add test case for making a node type referenceable
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java?rev=1853229&r1=1853228&r2=1853229&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java Fri Feb 8 17:42:24 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));
+ }
}