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

Fix buffer leaks in tests

Browse Source 
Motivation:

While working on #6087 some buffer leaks showed up.

Modifications:

Correctly release buffers.

Result:

No more buffer leaks in memcache and stomp codec tests.
This commit is contained in:
Norman Maurer 2016-12-02 11:06:02 +01:00 committed by Norman Maurer
parent efeb4cd8cb
commit 39aefdfa06
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheDecoderTest.java
View File

@ -76,7 +76,7 @@ public class BinaryMemcacheDecoderTest {
@After @After
public void teardown() throws Exception { public void teardown() throws Exception {
channel.finish(); channel.finishAndReleaseAll();
} }
/** /**
@ -150,6 +150,7 @@ public class BinaryMemcacheDecoderTest {
while (incoming.isReadable()) { while (incoming.isReadable()) {
channel.writeInbound(incoming.readBytes(5)); channel.writeInbound(incoming.readBytes(5));
} }
incoming.release();
BinaryMemcacheRequest request = channel.readInbound(); BinaryMemcacheRequest request = channel.readInbound();
@ -261,8 +262,13 @@ public class BinaryMemcacheDecoderTest {
BinaryMemcacheRequest request = new DefaultBinaryMemcacheRequest(key, extras); BinaryMemcacheRequest request = new DefaultBinaryMemcacheRequest(key, extras);
assertTrue(channel.writeOutbound(request)); assertTrue(channel.writeOutbound(request));
assertTrue(channel.writeInbound(channel.outboundMessages().toArray())); for (;;) {
ByteBuf buffer = channel.readOutbound();
if (buffer == null) {
break;
}
channel.writeInbound(buffer);
}
BinaryMemcacheRequest read = channel.readInbound(); BinaryMemcacheRequest read = channel.readInbound();
read.release(); read.release();
// tearDown will call "channel.finish()" // tearDown will call "channel.finish()"

14
codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheEncoderTest.java
View File

@ -46,7 +46,7 @@ public class BinaryMemcacheEncoderTest {
@After @After
public void teardown() throws Exception { public void teardown() throws Exception {
channel.finish(); channel.finishAndReleaseAll();
} }
@Test @Test
@ -92,8 +92,8 @@ public class BinaryMemcacheEncoderTest {
ByteBuf written = channel.readOutbound(); ByteBuf written = channel.readOutbound();
assertThat(written.readableBytes(), is(DEFAULT_HEADER_SIZE + extrasLength)); assertThat(written.readableBytes(), is(DEFAULT_HEADER_SIZE + extrasLength));
written.readBytes(DEFAULT_HEADER_SIZE); written.skipBytes(DEFAULT_HEADER_SIZE);
assertThat(written.readBytes(extrasLength).toString(CharsetUtil.UTF_8), equalTo(extrasContent)); assertThat(written.readSlice(extrasLength).toString(CharsetUtil.UTF_8), equalTo(extrasContent));
written.release(); written.release();
} }
@ -109,8 +109,8 @@ public class BinaryMemcacheEncoderTest {
ByteBuf written = channel.readOutbound(); ByteBuf written = channel.readOutbound();
assertThat(written.readableBytes(), is(DEFAULT_HEADER_SIZE + keyLength)); assertThat(written.readableBytes(), is(DEFAULT_HEADER_SIZE + keyLength));
written.readBytes(DEFAULT_HEADER_SIZE); written.skipBytes(DEFAULT_HEADER_SIZE);
assertThat(written.readBytes(keyLength).toString(CharsetUtil.UTF_8), equalTo("netty")); assertThat(written.readSlice(keyLength).toString(CharsetUtil.UTF_8), equalTo("netty"));
written.release(); written.release();
} }
@ -139,7 +139,7 @@ public class BinaryMemcacheEncoderTest {
written = channel.readOutbound(); written = channel.readOutbound();
assertThat(written.readableBytes(), is(content1.content().readableBytes())); assertThat(written.readableBytes(), is(content1.content().readableBytes()));
assertThat( assertThat(
written.readBytes(content1.content().readableBytes()).toString(CharsetUtil.UTF_8), written.readSlice(content1.content().readableBytes()).toString(CharsetUtil.UTF_8),
is("Netty") is("Netty")
); );
written.release(); written.release();
@ -147,7 +147,7 @@ public class BinaryMemcacheEncoderTest {
written = channel.readOutbound(); written = channel.readOutbound();
assertThat(written.readableBytes(), is(content2.content().readableBytes())); assertThat(written.readableBytes(), is(content2.content().readableBytes()));
assertThat( assertThat(
written.readBytes(content2.content().readableBytes()).toString(CharsetUtil.UTF_8), written.readSlice(content2.content().readableBytes()).toString(CharsetUtil.UTF_8),
is(" Rocks!") is(" Rocks!")
); );
written.release(); written.release();

2
codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheObjectAggregatorTest.java
View File

@ -76,7 +76,7 @@ public class BinaryMemcacheObjectAggregatorTest {
assertThat(channel.readInbound(), nullValue()); assertThat(channel.readInbound(), nullValue());
channel.finish(); assertFalse(channel.finish());
} }
@Test @Test

4
codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeEncoderTest.java
View File

@ -51,12 +51,16 @@ public class StompSubframeEncoderTest {
ByteBuf byteBuf = channel.readOutbound(); ByteBuf byteBuf = channel.readOutbound();
assertNotNull(byteBuf); assertNotNull(byteBuf);
aggregatedBuffer.writeBytes(byteBuf); aggregatedBuffer.writeBytes(byteBuf);
byteBuf.release();
byteBuf = channel.readOutbound(); byteBuf = channel.readOutbound();
assertNotNull(byteBuf); assertNotNull(byteBuf);
aggregatedBuffer.writeBytes(byteBuf); aggregatedBuffer.writeBytes(byteBuf);
byteBuf.release();
aggregatedBuffer.resetReaderIndex(); aggregatedBuffer.resetReaderIndex();
String content = aggregatedBuffer.toString(CharsetUtil.UTF_8); String content = aggregatedBuffer.toString(CharsetUtil.UTF_8);
assertEquals(StompTestConstants.CONNECT_FRAME, content); assertEquals(StompTestConstants.CONNECT_FRAME, content);
aggregatedBuffer.release();
} }
} }