Migrate codec-redis tests to JUnit 5 (#11318)
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 tests Result: Related to https://github.com/netty/netty/issues/10757
This commit is contained in:
parent
3efd9642ca
commit
84826a4ea6
@ -22,16 +22,20 @@ import io.netty.channel.embedded.EmbeddedChannel;
|
|||||||
import io.netty.handler.codec.DecoderException;
|
import io.netty.handler.codec.DecoderException;
|
||||||
import io.netty.util.IllegalReferenceCountException;
|
import io.netty.util.IllegalReferenceCountException;
|
||||||
import io.netty.util.ReferenceCountUtil;
|
import io.netty.util.ReferenceCountUtil;
|
||||||
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 org.junit.jupiter.api.function.Executable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static io.netty.handler.codec.redis.RedisCodecTestUtil.*;
|
import static io.netty.handler.codec.redis.RedisCodecTestUtil.*;
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.hamcrest.MatcherAssert.assertThat;
|
import static org.hamcrest.MatcherAssert.assertThat;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verifies the correct functionality of the {@link RedisDecoder} and {@link RedisArrayAggregator}.
|
* Verifies the correct functionality of the {@link RedisDecoder} and {@link RedisArrayAggregator}.
|
||||||
@ -40,7 +44,7 @@ public class RedisDecoderTest {
|
|||||||
|
|
||||||
private EmbeddedChannel channel;
|
private EmbeddedChannel channel;
|
||||||
|
|
||||||
@Before
|
@BeforeEach
|
||||||
public void setup() throws Exception {
|
public void setup() throws Exception {
|
||||||
channel = newChannel(false);
|
channel = newChannel(false);
|
||||||
}
|
}
|
||||||
@ -52,7 +56,7 @@ public class RedisDecoderTest {
|
|||||||
new RedisArrayAggregator());
|
new RedisArrayAggregator());
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@AfterEach
|
||||||
public void teardown() throws Exception {
|
public void teardown() throws Exception {
|
||||||
assertFalse(channel.finish());
|
assertFalse(channel.finish());
|
||||||
}
|
}
|
||||||
@ -67,8 +71,11 @@ public class RedisDecoderTest {
|
|||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = DecoderException.class)
|
@Test
|
||||||
public void shouldNotDecodeInlineCommandByDefault() {
|
public void shouldNotDecodeInlineCommandByDefault() {
|
||||||
|
assertThrows(DecoderException.class, new Executable() {
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
assertFalse(channel.writeInbound(byteBufOf("P")));
|
assertFalse(channel.writeInbound(byteBufOf("P")));
|
||||||
assertFalse(channel.writeInbound(byteBufOf("I")));
|
assertFalse(channel.writeInbound(byteBufOf("I")));
|
||||||
assertFalse(channel.writeInbound(byteBufOf("N")));
|
assertFalse(channel.writeInbound(byteBufOf("N")));
|
||||||
@ -77,6 +84,8 @@ public class RedisDecoderTest {
|
|||||||
|
|
||||||
channel.readInbound();
|
channel.readInbound();
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void shouldDecodeInlineCommand() {
|
public void shouldDecodeInlineCommand() {
|
||||||
@ -264,22 +273,27 @@ public class RedisDecoderTest {
|
|||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = IllegalReferenceCountException.class)
|
@Test
|
||||||
public void shouldErrorOnDoubleReleaseArrayReferenceCounted() throws Exception {
|
public void shouldErrorOnDoubleReleaseArrayReferenceCounted() {
|
||||||
ByteBuf buf = Unpooled.buffer();
|
ByteBuf buf = Unpooled.buffer();
|
||||||
buf.writeBytes(byteBufOf("*2\r\n"));
|
buf.writeBytes(byteBufOf("*2\r\n"));
|
||||||
buf.writeBytes(byteBufOf("*3\r\n:1\r\n:2\r\n:3\r\n"));
|
buf.writeBytes(byteBufOf("*3\r\n:1\r\n:2\r\n:3\r\n"));
|
||||||
buf.writeBytes(byteBufOf("*2\r\n+Foo\r\n-Bar\r\n"));
|
buf.writeBytes(byteBufOf("*2\r\n+Foo\r\n-Bar\r\n"));
|
||||||
assertTrue(channel.writeInbound(buf));
|
assertTrue(channel.writeInbound(buf));
|
||||||
|
|
||||||
ArrayRedisMessage msg = channel.readInbound();
|
final ArrayRedisMessage msg = channel.readInbound();
|
||||||
|
|
||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
|
assertThrows(IllegalReferenceCountException.class, new Executable() {
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Test(expected = IllegalReferenceCountException.class)
|
@Test
|
||||||
public void shouldErrorOnReleaseArrayChildReferenceCounted() throws Exception {
|
public void shouldErrorOnReleaseArrayChildReferenceCounted() {
|
||||||
ByteBuf buf = Unpooled.buffer();
|
ByteBuf buf = Unpooled.buffer();
|
||||||
buf.writeBytes(byteBufOf("*2\r\n"));
|
buf.writeBytes(byteBufOf("*2\r\n"));
|
||||||
buf.writeBytes(byteBufOf("*3\r\n:1\r\n:2\r\n:3\r\n"));
|
buf.writeBytes(byteBufOf("*3\r\n:1\r\n:2\r\n:3\r\n"));
|
||||||
@ -288,12 +302,17 @@ public class RedisDecoderTest {
|
|||||||
|
|
||||||
ArrayRedisMessage msg = channel.readInbound();
|
ArrayRedisMessage msg = channel.readInbound();
|
||||||
|
|
||||||
List<RedisMessage> children = msg.children();
|
final List<RedisMessage> children = msg.children();
|
||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
|
assertThrows(IllegalReferenceCountException.class, new Executable() {
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
ReferenceCountUtil.release(children.get(1));
|
ReferenceCountUtil.release(children.get(1));
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Test(expected = IllegalReferenceCountException.class)
|
@Test
|
||||||
public void shouldErrorOnReleasecontentOfArrayChildReferenceCounted() throws Exception {
|
public void shouldErrorOnReleasecontentOfArrayChildReferenceCounted() throws Exception {
|
||||||
ByteBuf buf = Unpooled.buffer();
|
ByteBuf buf = Unpooled.buffer();
|
||||||
buf.writeBytes(byteBufOf("*2\r\n"));
|
buf.writeBytes(byteBufOf("*2\r\n"));
|
||||||
@ -303,10 +322,15 @@ public class RedisDecoderTest {
|
|||||||
ArrayRedisMessage msg = channel.readInbound();
|
ArrayRedisMessage msg = channel.readInbound();
|
||||||
|
|
||||||
List<RedisMessage> children = msg.children();
|
List<RedisMessage> children = msg.children();
|
||||||
ByteBuf childBuf = ((FullBulkStringRedisMessage) children.get(0)).content();
|
final ByteBuf childBuf = ((FullBulkStringRedisMessage) children.get(0)).content();
|
||||||
ReferenceCountUtil.release(msg);
|
ReferenceCountUtil.release(msg);
|
||||||
|
assertThrows(IllegalReferenceCountException.class, new Executable() {
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
ReferenceCountUtil.release(childBuf);
|
ReferenceCountUtil.release(childBuf);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testPredefinedMessagesNotEqual() {
|
public void testPredefinedMessagesNotEqual() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user