svn commit: r1606644 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

[mr...@apache.org]

Author: mreutegg
Date: Mon Jun 30 08:22:44 2014
New Revision: 1606644

URL: http://svn.apache.org/r1606644
Log:
OAK-1861: Limit memory usage of DocumentNodeStore.readChildren()

Fix test and enable again.

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1606644&r1=1606643&r2=1606644&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Mon Jun 30 08:22:44 2014
@@ -51,7 +51,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.Iterables;
@@ -469,7 +468,6 @@ public class DocumentNodeStoreTest {
     }
 
     // OAK-1861
-    @Ignore
     @Test
     public void readChildrenWithDeletedSiblings() throws Exception {
         final AtomicInteger maxLimit = new AtomicInteger(0);
@@ -495,12 +493,12 @@ public class DocumentNodeStoreTest {
         }
         ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
 
-        builder = ns.getRoot().builder();
         // now remove all except the last one
         for (int i = 0; i < 999; i++) {
+            builder = ns.getRoot().builder();
             builder.getChildNode("node-" + i).remove();
+            ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
         }
-        ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
 
         for (ChildNodeEntry entry : ns.getRoot().getChildNodeEntries()) {
             entry.getName();