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

Migrate codec-stomp tests to JUnit 5 (#11312)

Browse Source 
Motivation:

JUnit 5 is more expressive, extensible, and composable in many ways, and it's better able to run tests in parallel.

Modifications:

Use JUnit5 in codec-stomp tests

Result:

Related to https://github.com/netty/netty/issues/10757
This commit is contained in:
Riley Park 2021-05-26 01:17:27 -07:00 committed by GitHub
parent 3e75ff3291
commit a1e672b5f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec-stomp/src/test/java/io/netty/handler/codec/stomp/DefaultStompFrameTest.java
View File

@ -16,12 +16,12 @@
package io.netty.handler.codec.stomp; package io.netty.handler.codec.stomp;
import io.netty.util.AsciiString; import io.netty.util.AsciiString;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultStompFrameTest { public class DefaultStompFrameTest {

37
codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompCommandDecodeTest.java
View File

@ -20,42 +20,36 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.runner.RunWith; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runners.Parameterized;
import static io.netty.util.CharsetUtil.*; import static io.netty.util.CharsetUtil.*;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
@RunWith(Parameterized.class)
public class StompCommandDecodeTest { public class StompCommandDecodeTest {
private final String rawCommand;
private final StompCommand expectedCommand;
private final Boolean valid;
private EmbeddedChannel channel; private EmbeddedChannel channel;
public StompCommandDecodeTest(String rawCommand, StompCommand expectedCommand, Boolean valid) { @BeforeEach
this.rawCommand = rawCommand;
this.expectedCommand = expectedCommand;
this.valid = valid;
}
@Before
public void setUp() { public void setUp() {
channel = new EmbeddedChannel(new StompSubframeDecoder(true)); channel = new EmbeddedChannel(new StompSubframeDecoder(true));
} }
@After @AfterEach
public void tearDown() { public void tearDown() {
assertFalse(channel.finish()); assertFalse(channel.finish());
} }
@Test @ParameterizedTest(name = "{index}: testDecodeCommand({0}) = {1}")
public void testDecodeCommand() { @MethodSource("stompCommands")
public void testDecodeCommand(String rawCommand, StompCommand expectedCommand, Boolean valid) {
byte[] frameContent = String.format("%s\n\n\0", rawCommand).getBytes(UTF_8); byte[] frameContent = String.format("%s\n\n\0", rawCommand).getBytes(UTF_8);
ByteBuf incoming = Unpooled.wrappedBuffer(frameContent); ByteBuf incoming = Unpooled.wrappedBuffer(frameContent);
assertTrue(channel.writeInbound(incoming)); assertTrue(channel.writeInbound(incoming));
@ -77,7 +71,6 @@ public class StompCommandDecodeTest {
} }
} }
@Parameterized.Parameters(name = "{index}: testDecodeCommand({0}) = {1}")
public static Collection<Object[]> stompCommands() { public static Collection<Object[]> stompCommands() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][] {
{ "STOMP", StompCommand.STOMP, true }, { "STOMP", StompCommand.STOMP, true },

6
codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompHeadersTest.java
View File

@ -16,10 +16,10 @@
package io.netty.handler.codec.stomp; package io.netty.handler.codec.stomp;
import io.netty.util.AsciiString; import io.netty.util.AsciiString;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
public class StompHeadersTest { public class StompHeadersTest {
@Test @Test

64
codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeAggregatorTest.java
View File

@ -20,23 +20,28 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.handler.codec.TooLongFrameException; import io.netty.handler.codec.TooLongFrameException;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Assert; import org.junit.jupiter.api.BeforeEach;
import org.junit.Before; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class StompSubframeAggregatorTest { public class StompSubframeAggregatorTest {
private EmbeddedChannel channel; private EmbeddedChannel channel;
@Before @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
channel = new EmbeddedChannel(new StompSubframeDecoder(), new StompSubframeAggregator(100000)); channel = new EmbeddedChannel(new StompSubframeDecoder(), new StompSubframeAggregator(100000));
} }
@After @AfterEach
public void teardown() throws Exception { public void teardown() throws Exception {
Assert.assertFalse(channel.finish()); assertFalse(channel.finish());
} }
@Test @Test
@ -48,7 +53,7 @@ public class StompSubframeAggregatorTest {
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test @Test
@ -58,12 +63,12 @@ public class StompSubframeAggregatorTest {
channel.writeInbound(incoming); channel.writeInbound(incoming);
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
Assert.assertNotNull(frame); assertNotNull(frame);
Assert.assertEquals(StompCommand.SEND, frame.command()); assertEquals(StompCommand.SEND, frame.command());
Assert.assertEquals("hello, queue a!!!", frame.content().toString(CharsetUtil.UTF_8)); assertEquals("hello, queue a!!!", frame.content().toString(CharsetUtil.UTF_8));
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test @Test
@ -73,12 +78,12 @@ public class StompSubframeAggregatorTest {
channel.writeInbound(incoming); channel.writeInbound(incoming);
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
Assert.assertNotNull(frame); assertNotNull(frame);
Assert.assertEquals(StompCommand.SEND, frame.command()); assertEquals(StompCommand.SEND, frame.command());
Assert.assertEquals("body", frame.content().toString(CharsetUtil.UTF_8)); assertEquals("body", frame.content().toString(CharsetUtil.UTF_8));
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test @Test
@ -91,12 +96,12 @@ public class StompSubframeAggregatorTest {
} }
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
Assert.assertNotNull(frame); assertNotNull(frame);
Assert.assertEquals(StompCommand.SEND, frame.command()); assertEquals(StompCommand.SEND, frame.command());
Assert.assertEquals("first part of body\nsecond part of body", frame.content().toString(CharsetUtil.UTF_8)); assertEquals("first part of body\nsecond part of body", frame.content().toString(CharsetUtil.UTF_8));
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test @Test
@ -108,11 +113,11 @@ public class StompSubframeAggregatorTest {
channel.writeInbound(incoming); channel.writeInbound(incoming);
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
Assert.assertNotNull(frame); assertNotNull(frame);
Assert.assertEquals(StompCommand.SEND, frame.command()); assertEquals(StompCommand.SEND, frame.command());
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test @Test
@ -124,23 +129,24 @@ public class StompSubframeAggregatorTest {
channel.writeInbound(Unpooled.wrappedBuffer(StompTestConstants.SEND_FRAME_1.getBytes())); channel.writeInbound(Unpooled.wrappedBuffer(StompTestConstants.SEND_FRAME_1.getBytes()));
StompFrame frame = channel.readInbound(); StompFrame frame = channel.readInbound();
Assert.assertEquals(StompCommand.CONNECT, frame.command()); assertEquals(StompCommand.CONNECT, frame.command());
frame.release(); frame.release();
frame = channel.readInbound(); frame = channel.readInbound();
Assert.assertEquals(StompCommand.CONNECTED, frame.command()); assertEquals(StompCommand.CONNECTED, frame.command());
frame.release(); frame.release();
frame = channel.readInbound(); frame = channel.readInbound();
Assert.assertEquals(StompCommand.SEND, frame.command()); assertEquals(StompCommand.SEND, frame.command());
frame.release(); frame.release();
Assert.assertNull(channel.readInbound()); assertNull(channel.readInbound());
} }
@Test(expected = TooLongFrameException.class) @Test
public void testTooLongFrameException() { public void testTooLongFrameException() {
EmbeddedChannel channel = new EmbeddedChannel(new StompSubframeDecoder(), new StompSubframeAggregator(10)); EmbeddedChannel channel = new EmbeddedChannel(new StompSubframeDecoder(), new StompSubframeAggregator(10));
channel.writeInbound(Unpooled.wrappedBuffer(StompTestConstants.SEND_FRAME_1.getBytes())); assertThrows(TooLongFrameException.class,
() -> channel.writeInbound(Unpooled.wrappedBuffer(StompTestConstants.SEND_FRAME_1.getBytes())));
} }
} }

17
codec-stomp/src/test/java/io/netty/handler/codec/stomp/StompSubframeDecoderTest.java
View File

@ -18,24 +18,29 @@ package io.netty.handler.codec.stomp;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static io.netty.handler.codec.stomp.StompTestConstants.*; import static io.netty.handler.codec.stomp.StompTestConstants.*;
import static io.netty.util.CharsetUtil.*; import static io.netty.util.CharsetUtil.*;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class StompSubframeDecoderTest { public class StompSubframeDecoderTest {
private EmbeddedChannel channel; private EmbeddedChannel channel;
@Before @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
channel = new EmbeddedChannel(new StompSubframeDecoder()); channel = new EmbeddedChannel(new StompSubframeDecoder());
} }
@After @AfterEach
public void teardown() throws Exception { public void teardown() throws Exception {
assertFalse(channel.finish()); assertFalse(channel.finish());
} }

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

@ -20,23 +20,27 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.util.AsciiString; import io.netty.util.AsciiString;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static io.netty.handler.codec.stomp.StompTestConstants.*; import static io.netty.handler.codec.stomp.StompTestConstants.*;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class StompSubframeEncoderTest { public class StompSubframeEncoderTest {
private EmbeddedChannel channel; private EmbeddedChannel channel;
@Before @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
channel = new EmbeddedChannel(new StompSubframeEncoder()); channel = new EmbeddedChannel(new StompSubframeEncoder());
} }
@After @AfterEach
public void teardown() throws Exception { public void teardown() throws Exception {
assertFalse(channel.finish()); assertFalse(channel.finish());
} }