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 md...@apache.org on 2016/04/20 23:45:40 UTC

svn commit: r1740202 - /jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java

Author: mduerig
Date: Wed Apr 20 21:45:39 2016
New Revision: 1740202

URL: http://svn.apache.org/viewvc?rev=1740202&view=rev
Log:
OAK-3348: Cross gc sessions might introduce references to pre-compacted segments
Re-implement commented test through publicly accessible methods

Modified:
    jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java

Modified: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java?rev=1740202&r1=1740201&r2=1740202&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java Wed Apr 20 21:45:39 2016
@@ -25,9 +25,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Set;
 
-import org.apache.jackrabbit.oak.segment.Segment;
-import org.apache.jackrabbit.oak.segment.SegmentId;
-import org.apache.jackrabbit.oak.segment.SegmentTracker;
 import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
 import org.junit.Test;
 
@@ -97,17 +94,18 @@ public class SegmentIdFactoryTest {
     /**
      * OAK-2049 - error for data segments
      */
-    // FIXME OAK-3348 fix test
-//    @Test(expected = IllegalStateException.class)
-//    public void dataAIOOBE() {
-//        SegmentId id = factory.newDataSegmentId();
-//        byte[] buffer = SegmentBufferWriter.createNewBuffer(SegmentVersion.V_11);
-//        ByteBuffer data = ByteBuffer.allocate(Segment.MAX_SEGMENT_SIZE);
-//        data.put(buffer);
-//        data.rewind();
-//        Segment s = new Segment(factory, id, data);
-//        s.getRefId(1);
-//    }
+    @Test(expected = IllegalStateException.class)
+    public void dataAIOOBE() throws IOException {
+        MemoryStore store = new MemoryStore();
+        Segment segment = store.getHead().getSegment();
+        byte[] buffer = new byte[segment.size()];
+        segment.readBytes(Segment.MAX_SEGMENT_SIZE - segment.size(), buffer, 0, segment.size());
+
+        SegmentId id = factory.newDataSegmentId();
+        ByteBuffer data = ByteBuffer.wrap(buffer);
+        Segment s = new Segment(factory, id, data);
+        s.getRefId(1);
+    }
 
     /**
      * OAK-2049 - error for bulk segments