svn commit: r1661163 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java

[mduerig]

Author: mduerig
Date: Fri Feb 20 17:07:12 2015
New Revision: 1661163

URL: http://svn.apache.org/r1661163
Log:
OAK-2542: Update RecordUsageAnalyser to reflect changes in segment format
Parametrise RecordUsageAnalyserTest to run on V_10 and V_11 segment format

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java?rev=1661163&r1=1661162&r2=1661163&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java
 Fri Feb 20 17:07:12 2015
@@ -29,11 +29,13 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.segment.ListRecord.LEVEL_SIZE;
 import static org.apache.jackrabbit.oak.plugins.segment.Segment.MEDIUM_LIMIT;
 import static org.apache.jackrabbit.oak.plugins.segment.Segment.SMALL_LIMIT;
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_10;
 import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.List;
 import java.util.Random;
 
 import com.google.common.collect.ImmutableList;
@@ -42,18 +44,32 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class RecordUsageAnalyserTest {
+    private final SegmentVersion segmentVersion;
+
     private SegmentStore store;
     private SegmentWriter writer;
     private RecordUsageAnalyser analyser = new RecordUsageAnalyser();
 
+    @Parameterized.Parameters
+    public static List<SegmentVersion[]> fixtures() {
+        return ImmutableList.of(new SegmentVersion[] {V_10}, new 
SegmentVersion[] {V_11});
+    }
+
+    public RecordUsageAnalyserTest(SegmentVersion segmentVersion) {
+        this.segmentVersion = segmentVersion;
+    }
+
     @Before
     public void setup() {
         store = mock(SegmentStore.class);
         SegmentTracker tracker = new SegmentTracker(store);
         when(store.getTracker()).thenReturn(tracker);
-        writer = new SegmentWriter(store, store.getTracker(), V_11);
+        writer = new SegmentWriter(store, store.getTracker(), segmentVersion);
         analyser = new RecordUsageAnalyser();
     }
 
@@ -271,7 +287,11 @@ public class RecordUsageAnalyserTest {
 
         SegmentNodeState node = writer.writeNode(builder.getNodeState());
         analyser.analyseNode(node.getRecordId());
-        assertCounts(analyser, 1, 5, 6, 1, 1, 1, 0, 10, 1, 1, 2, 3);
+        if (segmentVersion == V_11) {
+            assertCounts(analyser, 1, 5, 6, 1, 1, 1, 0, 10, 1, 1, 2, 3);
+        } else {
+            assertCounts(analyser, 1, 3, 6, 1, 1, 1, 0, 10, 1, 1, 2, 3);
+        }
     }
 
     private static Blob createRandomBlob(int size) {