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

Fix testfailures when running tests via IntelliJ (#10100)

Browse Source 
Motivation:

For whatever reason IntelliJ produces some testfailures when using mock(ChannelHandler.class). In this case it does not "correctly" detect that the @Skip annotation should not be taken into effect.

Modifications:

Use spy(...) to ensure we correctly invoke methods

Result:

No more tests failures when running via IntelliJ.
This commit is contained in:
Norman Maurer 2020-03-12 10:11:35 +01:00 committed by GitHub
parent fa397c6127
commit e6ec6b56fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
transport/src/test/java/io/netty/channel/AbstractChannelTest.java
View File

@ -36,7 +36,23 @@ public class AbstractChannelTest {
when(eventLoop.unsafe()).thenReturn(mock(EventLoop.Unsafe.class));
TestChannel channel = new TestChannel(eventLoop);
ChannelHandler handler = mock(ChannelHandler.class);
// Using spy as otherwise intelliJ will not be able to understand that we dont want to skip the handler
ChannelHandler handler = spy(new ChannelHandler() {
@Override
public void handlerAdded(ChannelHandlerContext ctx) {
// NOOP
}
@Override
public void channelRegistered(ChannelHandlerContext ctx) {
ctx.fireChannelRegistered();
}
@Override
public void channelActive(ChannelHandlerContext ctx) {
ctx.fireChannelActive();
}
});
channel.pipeline().addLast(handler);
registerChannel(channel);
@ -59,7 +75,23 @@ public class AbstractChannelTest {
}).when(eventLoop).execute(any(Runnable.class));
final TestChannel channel = new TestChannel(eventLoop);
ChannelHandler handler = mock(ChannelHandler.class);
// Using spy as otherwise intelliJ will not be able to understand that we dont want to skip the handler
ChannelHandler handler = spy(new ChannelHandler() {
@Override
public void channelRegistered(ChannelHandlerContext ctx) {
ctx.fireChannelRegistered();
}
@Override
public void channelUnregistered(ChannelHandlerContext ctx) {
ctx.fireChannelUnregistered();
}
@Override
public void channelActive(ChannelHandlerContext ctx) {
ctx.fireChannelActive();
}
});
channel.pipeline().addLast(handler);
@ -71,7 +103,7 @@ public class AbstractChannelTest {
verify(handler).handlerAdded(any(ChannelHandlerContext.class));
// Should register twice
verify(handler, times(2)) .channelRegistered(any(ChannelHandlerContext.class));
verify(handler, times(2)) .channelRegistered(any(ChannelHandlerContext.class));
verify(handler).channelActive(any(ChannelHandlerContext.class));
verify(handler).channelUnregistered(any(ChannelHandlerContext.class));
}