svn commit: r1867060 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Sep 17 14:16:20 2019
New Revision: 1867060

URL: http://svn.apache.org/viewvc?rev=1867060&view=rev
Log:
OAK-8629: Node bundling exposes hidden property

Update test and add non-bundled descendant below bundled nodes

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1867060&r1=1867059&r2=1867060&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java Tue Sep 17 14:16:20 2019
@@ -815,7 +815,9 @@ public class DocumentBundlingTest {
     public void deleteAndRecreateAsNonBundledNode() throws Exception {
         NodeBuilder builder = store.getRoot().builder();
         NodeBuilder fileNode = newNode("nt:file");
-        fileNode.child("jcr:content").setProperty("jcr:data", "foo");
+        NodeBuilder contentNode = fileNode.child("jcr:content");
+        contentNode.setProperty("jcr:data", "foo");
+        contentNode.child("extra");
         builder.child("test").setChildNode("book.jpg", fileNode.getNodeState());
         merge(builder);
 
@@ -824,15 +826,29 @@ public class DocumentBundlingTest {
         merge(builder);
 
         builder = store.getRoot().builder();
-        NodeState state = newNode("oak:Unstructured").getNodeState();
-        builder.child("test").setChildNode("book.jpg", state);
+        builder.child("test").setChildNode("book.jpg",
+                newNode("oak:Unstructured").getNodeState());
+        builder.child("test").child("book.jpg").setChildNode("jcr:content",
+                newNode("oak:Unstructured").getNodeState());
         merge(builder);
 
+        Set<String> names = propertyNamesFor("/test/book.jpg");
+        assertThat(names, containsInAnyOrder("jcr:primaryType"));
+
+        names = propertyNamesFor("/test/book.jpg/jcr:content");
+        assertThat(names, containsInAnyOrder("jcr:primaryType"));
+    }
+
+    private Set<String> propertyNamesFor(String path) {
         Set<String> names = new HashSet<>();
-        for (PropertyState p : store.getRoot().getChildNode("test").getChildNode("book.jpg").getProperties()) {
+        NodeState state = store.getRoot();
+        for (String name : PathUtils.elements(path)) {
+            state = state.getChildNode(name);
+        }
+        for (PropertyState p : state.getProperties()) {
             names.add(p.getName());
         }
-        assertThat(names, containsInAnyOrder("jcr:primaryType"));
+        return names;
     }
 
     @Test