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

Fix possible leaks in Http2ServerDowngraderTest

Browse Source 
Motivation:

We need to ensure we release all ReferenceCounted objects during tests to not leak.

Modifications:

Fix possible leaks by calling release()

Result:

No more leaks in tests.
This commit is contained in:
Norman Maurer 2016-05-10 09:18:33 +02:00
parent 690ab563e7
commit 341a235fea
1 changed files with 66 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ServerDowngraderTest.java
View File

@ -34,7 +34,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.codec.http.LastHttpContent; import io.netty.handler.codec.http.LastHttpContent;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import io.netty.util.ReferenceCountUtil;
import org.junit.Test; import org.junit.Test;
@ -71,8 +70,12 @@ public class Http2ServerDowngraderTest {
assertFalse(headersFrame.isEndStream()); assertFalse(headersFrame.isEndStream());
Http2DataFrame dataFrame = ch.readOutbound(); Http2DataFrame dataFrame = ch.readOutbound();
assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertTrue(dataFrame.isEndStream()); assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertTrue(dataFrame.isEndStream());
} finally {
dataFrame.release();
}
assertThat(ch.readOutbound(), is(nullValue())); assertThat(ch.readOutbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -112,8 +115,12 @@ public class Http2ServerDowngraderTest {
assertFalse(headersFrame.isEndStream()); assertFalse(headersFrame.isEndStream());
Http2DataFrame dataFrame = ch.readOutbound(); Http2DataFrame dataFrame = ch.readOutbound();
assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertFalse(dataFrame.isEndStream()); assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertFalse(dataFrame.isEndStream());
} finally {
dataFrame.release();
}
Http2HeadersFrame trailersFrame = ch.readOutbound(); Http2HeadersFrame trailersFrame = ch.readOutbound();
assertThat(trailersFrame.headers().get("key").toString(), is("value")); assertThat(trailersFrame.headers().get("key").toString(), is("value"));
@ -145,8 +152,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeOutbound(content)); assertTrue(ch.writeOutbound(content));
Http2DataFrame dataFrame = ch.readOutbound(); Http2DataFrame dataFrame = ch.readOutbound();
assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertFalse(dataFrame.isEndStream()); assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertFalse(dataFrame.isEndStream());
} finally {
dataFrame.release();
}
assertThat(ch.readOutbound(), is(nullValue())); assertThat(ch.readOutbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -159,8 +170,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeOutbound(end)); assertTrue(ch.writeOutbound(end));
Http2DataFrame emptyFrame = ch.readOutbound(); Http2DataFrame emptyFrame = ch.readOutbound();
assertThat(emptyFrame.content().readableBytes(), is(0)); try {
assertTrue(emptyFrame.isEndStream()); assertThat(emptyFrame.content().readableBytes(), is(0));
assertTrue(emptyFrame.isEndStream());
} finally {
emptyFrame.release();
}
assertThat(ch.readOutbound(), is(nullValue())); assertThat(ch.readOutbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -174,8 +189,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeOutbound(end)); assertTrue(ch.writeOutbound(end));
Http2DataFrame dataFrame = ch.readOutbound(); Http2DataFrame dataFrame = ch.readOutbound();
assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertTrue(dataFrame.isEndStream()); assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertTrue(dataFrame.isEndStream());
} finally {
dataFrame.release();
}
assertThat(ch.readOutbound(), is(nullValue())); assertThat(ch.readOutbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -207,8 +226,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeOutbound(trailers)); assertTrue(ch.writeOutbound(trailers));
Http2DataFrame dataFrame = ch.readOutbound(); Http2DataFrame dataFrame = ch.readOutbound();
assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertFalse(dataFrame.isEndStream()); assertThat(dataFrame.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertFalse(dataFrame.isEndStream());
} finally {
dataFrame.release();
}
Http2HeadersFrame headerFrame = ch.readOutbound(); Http2HeadersFrame headerFrame = ch.readOutbound();
assertThat(headerFrame.headers().get("key").toString(), is("value")); assertThat(headerFrame.headers().get("key").toString(), is("value"));
@ -247,12 +270,15 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeInbound(new DefaultHttp2HeadersFrame(headers, true))); assertTrue(ch.writeInbound(new DefaultHttp2HeadersFrame(headers, true)));
FullHttpRequest request = ch.readInbound(); FullHttpRequest request = ch.readInbound();
ReferenceCountUtil.releaseLater(request); try {
assertThat(request.uri(), is("/")); assertThat(request.uri(), is("/"));
assertThat(request.method(), is(HttpMethod.GET)); assertThat(request.method(), is(HttpMethod.GET));
assertThat(request.protocolVersion(), is(HttpVersion.HTTP_1_1)); assertThat(request.protocolVersion(), is(HttpVersion.HTTP_1_1));
assertThat(request.content().readableBytes(), is(0)); assertThat(request.content().readableBytes(), is(0));
assertTrue(request.trailingHeaders().isEmpty()); assertTrue(request.trailingHeaders().isEmpty());
} finally {
request.release();
}
assertThat(ch.readInbound(), is(nullValue())); assertThat(ch.readInbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -266,9 +292,13 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeInbound(new DefaultHttp2HeadersFrame(headers, true))); assertTrue(ch.writeInbound(new DefaultHttp2HeadersFrame(headers, true)));
LastHttpContent trailers = ch.readInbound(); LastHttpContent trailers = ch.readInbound();
assertThat(trailers.content().readableBytes(), is(0)); try {
assertThat(trailers.trailingHeaders().get("key").toString(), is("value")); assertThat(trailers.content().readableBytes(), is(0));
assertFalse(trailers instanceof FullHttpRequest); assertThat(trailers.trailingHeaders().get("key").toString(), is("value"));
assertFalse(trailers instanceof FullHttpRequest);
} finally {
trailers.release();
}
assertThat(ch.readInbound(), is(nullValue())); assertThat(ch.readInbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -281,8 +311,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeInbound(new DefaultHttp2DataFrame(hello))); assertTrue(ch.writeInbound(new DefaultHttp2DataFrame(hello)));
HttpContent content = ch.readInbound(); HttpContent content = ch.readInbound();
assertThat(content.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertFalse(content instanceof LastHttpContent); assertThat(content.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertFalse(content instanceof LastHttpContent);
} finally {
content.release();
}
assertThat(ch.readInbound(), is(nullValue())); assertThat(ch.readInbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -295,8 +329,12 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeInbound(new DefaultHttp2DataFrame(hello, true))); assertTrue(ch.writeInbound(new DefaultHttp2DataFrame(hello, true)));
LastHttpContent content = ch.readInbound(); LastHttpContent content = ch.readInbound();
assertThat(content.content().toString(CharsetUtil.UTF_8), is("hello world")); try {
assertTrue(content.trailingHeaders().isEmpty()); assertThat(content.content().toString(CharsetUtil.UTF_8), is("hello world"));
assertTrue(content.trailingHeaders().isEmpty());
} finally {
content.release();
}
assertThat(ch.readInbound(), is(nullValue())); assertThat(ch.readInbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());
@ -310,8 +348,8 @@ public class Http2ServerDowngraderTest {
assertTrue(ch.writeInbound(reset)); assertTrue(ch.writeInbound(reset));
assertTrue(ch.writeInbound(goaway)); assertTrue(ch.writeInbound(goaway));
assertEquals(ch.readInbound(), reset); assertEquals(reset, ch.readInbound());
assertEquals(ch.readInbound(), goaway); assertEquals(goaway, ch.readInbound());
assertThat(ch.readInbound(), is(nullValue())); assertThat(ch.readInbound(), is(nullValue()));
assertFalse(ch.finish()); assertFalse(ch.finish());