svn commit: r1753244 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java

[frm]

Author: frm
Date: Mon Jul 18 15:30:03 2016
New Revision: 1753244

URL: http://svn.apache.org/viewvc?rev=1753244&view=rev
Log:
OAK-4570 - Selectively enable only the node cache in the failing test case

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java?rev=1753244&r1=1753243&r2=1753244&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java
 Mon Jul 18 15:30:03 2016
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.base.Supplier;
 import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -97,7 +99,11 @@ public class NodeRecordTest {
             // otherwise the write of some records (in this case, template
             // records) will be cached and prevent this test to fail.
 
-            SegmentWriter writer = 
SegmentWriterBuilder.segmentWriterBuilder("test").withGeneration(generation).withWriterPool().withoutCache().build(store);
+            SegmentWriter writer = 
SegmentWriterBuilder.segmentWriterBuilder("test")
+                    .withGeneration(generation)
+                    .withWriterPool()
+                    .with(nodesOnlyCache())
+                    .build(store);
 
             generation.set(1);
 
@@ -145,6 +151,32 @@ public class NodeRecordTest {
         }
     }
 
+    private WriterCacheManager nodesOnlyCache() {
+        return new WriterCacheManager() {
+
+            WriterCacheManager defaultCache = new WriterCacheManager.Default();
+
+            @Nonnull
+            @Override
+            public RecordCache<String> getStringCache(int generation) {
+                return Empty.INSTANCE.getStringCache(generation);
+            }
+
+            @Nonnull
+            @Override
+            public RecordCache<Template> getTemplateCache(int generation) {
+                return Empty.INSTANCE.getTemplateCache(generation);
+            }
+
+            @Nonnull
+            @Override
+            public NodeCache getNodeCache(int generation) {
+                return defaultCache.getNodeCache(generation);
+            }
+
+        };
+    }
+
     private boolean isRootRecord(SegmentNodeState sns) {
         Segment segment = sns.getRecordId().getSegment();