Add tests to try to track down some buffer issues

Norman Maurer · Norman Maurer · commit 60b06df84f35 · 2013-09-02T14:17:16.000+02:00
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java b/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java
@@ -1720,4 +1720,32 @@ public boolean process(byte value) throws Exception {
 
         assertThat(lastIndex.get(), is(CAPACITY / 4));
     }
+
+    @Test
+    public void testInternalNioBuffer() {
+        testInternalNioBuffer(128);
+        testInternalNioBuffer(1024);
+        testInternalNioBuffer(4 * 1024);
+        testInternalNioBuffer(64 * 1024);
+        testInternalNioBuffer(32 * 1024 * 1024);
+        testInternalNioBuffer(64 * 1024 * 1024);
+    }
+
+    private void testInternalNioBuffer(int a) {
+        ByteBuf buffer = freeLater(newBuffer(2));
+        ByteBuffer buf = buffer.internalNioBuffer(0, 1);
+        assertEquals(1, buf.remaining());
+
+        for (int i = 0; i < a; i++) {
+            buffer.writeByte(i);
+        }
+
+        buf = buffer.internalNioBuffer(0, a);
+        assertEquals(a, buf.remaining());
+
+        for (int i = 0; i < a; i++) {
+            assertEquals((byte) i, buf.get());
+        }
+        assertFalse(buf.hasRemaining());
+    }
 }
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java b/buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
@@ -566,4 +566,10 @@ public void testDuplicateEmpty() {
         assertEquals(0, buf.numComponents());
         assertEquals(0, freeLater(buf.duplicate()).readableBytes());
     }
+
+    @Test(expected = UnsupportedOperationException.class)
+    @Override
+    public void testInternalNioBuffer() {
+        super.testInternalNioBuffer();
+    }
 }
diff --git a/buffer/src/test/java/io/netty/buffer/DuplicateByteBufTest.java b/buffer/src/test/java/io/netty/buffer/DuplicateByteBufTest.java
@@ -15,6 +15,7 @@
  */
 package io.netty.buffer;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -42,4 +43,13 @@ protected ByteBuf[] components() {
     public void shouldNotAllowNullInConstructor() {
         new DuplicatedByteBuf(null);
     }
+
+    @Ignore
+    @Test
+    // Test which shows bug
+    // https://github.com/netty/netty/issues/1802
+    public void testInternalNioBuffer() {
+        super.testInternalNioBuffer();
+    }
+
 }
diff --git a/buffer/src/test/java/io/netty/buffer/SlicedByteBufTest.java b/buffer/src/test/java/io/netty/buffer/SlicedByteBufTest.java
@@ -46,4 +46,10 @@ protected ByteBuf[] components() {
     public void shouldNotAllowNullInConstructor() {
         new SlicedByteBuf(null, 0, 0);
     }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    @Override
+    public void testInternalNioBuffer() {
+        super.testInternalNioBuffer();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -566,4 +566,10 @@ public void testDuplicateEmpty() {`
`566`	`566`	`assertEquals(0, buf.numComponents());`
`567`	`567`	`assertEquals(0, freeLater(buf.duplicate()).readableBytes());`
`568`	`568`	`}`
	`569`	`+`
	`570`	`+ @Test(expected = UnsupportedOperationException.class)`
	`571`	`+ @Override`
	`572`	`+ public void testInternalNioBuffer() {`
	`573`	`+ super.testInternalNioBuffer();`
	`574`	`+ }`
`569`	`575`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,10 @@ protected ByteBuf[] components() {`
`46`	`46`	`public void shouldNotAllowNullInConstructor() {`
`47`	`47`	`new SlicedByteBuf(null, 0, 0);`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ @Test(expected = IndexOutOfBoundsException.class)`
	`51`	`+ @Override`
	`52`	`+ public void testInternalNioBuffer() {`
	`53`	`+ super.testInternalNioBuffer();`
	`54`	`+ }`
`49`	`55`	`}`