andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use direct ByteBuf for the test to make sure it is not copied

Browse Source
This commit is contained in:
Norman Maurer 2013-10-07 08:07:38 +02:00
parent 00f99dbff6
commit 20a16ae8dc
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
transport/src/test/java/io/netty/channel/ChannelOutboundBufferTest.java
View File

@ -39,6 +39,11 @@ public class ChannelOutboundBufferTest {
assertNull(b); assertNull(b);
} }
assertEquals(0, buffer.nioBufferCount()); assertEquals(0, buffer.nioBufferCount());
for (;;) {
if (!buffer.remove()) {
break;
}
}
} }
@Test @Test
@ -55,6 +60,7 @@ public class ChannelOutboundBufferTest {
assertEquals(0, buffer.nioBufferCount()); assertEquals(0, buffer.nioBufferCount());
ByteBuf buf = copiedBuffer("buf1", CharsetUtil.US_ASCII); ByteBuf buf = copiedBuffer("buf1", CharsetUtil.US_ASCII);
ByteBuffer nioBuf = buf.internalNioBuffer(0, buf.readableBytes());
buffer.addMessage(buf, channel.voidPromise()); buffer.addMessage(buf, channel.voidPromise());
buffers = buffer.nioBuffers(); buffers = buffer.nioBuffers();
assertEquals("Should still be 0 as not flushed yet", 0, buffer.nioBufferCount()); assertEquals("Should still be 0 as not flushed yet", 0, buffer.nioBufferCount());
@ -67,11 +73,16 @@ public class ChannelOutboundBufferTest {
assertEquals("Should still be 0 as not flushed yet", 1, buffer.nioBufferCount()); assertEquals("Should still be 0 as not flushed yet", 1, buffer.nioBufferCount());
for (int i = 0; i < buffers.length; i++) { for (int i = 0; i < buffers.length; i++) {
if (i == 0) { if (i == 0) {
assertEquals(buffers[i], buf.internalNioBuffer(0, buf.readableBytes())); assertEquals(buffers[i], nioBuf);
} else { } else {
assertNull(buffers[i]); assertNull(buffers[i]);
} }
} }
for (;;) {
if (!buffer.remove()) {
break;
}
}
} }
@Test @Test
@ -80,7 +91,7 @@ public class ChannelOutboundBufferTest {
ChannelOutboundBuffer buffer = ChannelOutboundBuffer.newInstance(channel); ChannelOutboundBuffer buffer = ChannelOutboundBuffer.newInstance(channel);
ByteBuf buf = copiedBuffer("buf1", CharsetUtil.US_ASCII); ByteBuf buf = directBuffer().writeBytes("buf1".getBytes(CharsetUtil.US_ASCII));
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
buffer.addMessage(buf.copy(), channel.voidPromise()); buffer.addMessage(buf.copy(), channel.voidPromise());
} }
@ -96,6 +107,11 @@ public class ChannelOutboundBufferTest {
for (int i = 0; i < buffers.length; i++) { for (int i = 0; i < buffers.length; i++) {
assertEquals(buffers[i], buf.internalNioBuffer(0, buf.readableBytes())); assertEquals(buffers[i], buf.internalNioBuffer(0, buf.readableBytes()));
} }
for (;;) {
if (!buffer.remove()) {
break;
}
}
} }
@Test @Test
@ -105,11 +121,10 @@ public class ChannelOutboundBufferTest {
ChannelOutboundBuffer buffer = ChannelOutboundBuffer.newInstance(channel); ChannelOutboundBuffer buffer = ChannelOutboundBuffer.newInstance(channel);
CompositeByteBuf comp = compositeBuffer(256); CompositeByteBuf comp = compositeBuffer(256);
ByteBuf buf = copiedBuffer("buf1", CharsetUtil.US_ASCII); ByteBuf buf = directBuffer().writeBytes("buf1".getBytes(CharsetUtil.US_ASCII));
for (int i = 0; i < 65; i++) { for (int i = 0; i < 65; i++) {
comp.addComponent(buf.copy()).writerIndex(comp.writerIndex() + buf.readableBytes()); comp.addComponent(buf.copy()).writerIndex(comp.writerIndex() + buf.readableBytes());
} }
System.out.println(comp.nioBufferCount());
buffer.addMessage(comp, channel.voidPromise()); buffer.addMessage(comp, channel.voidPromise());
ByteBuffer[] buffers = buffer.nioBuffers(); ByteBuffer[] buffers = buffer.nioBuffers();
@ -128,6 +143,11 @@ public class ChannelOutboundBufferTest {
assertNull(buffers[i]); assertNull(buffers[i]);
} }
} }
for (;;) {
if (!buffer.remove()) {
break;
}
}
} }
private static final class TestChannel extends AbstractChannel { private static final class TestChannel extends AbstractChannel {