diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java index a866135a8a..bf72863994 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java @@ -18,9 +18,11 @@ package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; -import org.junit.Test; +import org.junit.jupiter.api.Test; -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.assertNull; public class SocksAuthRequestDecoderTest { diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java index 86e38bf508..6de75a30e0 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socks; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksAuthRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java index e1a21a9c6e..5faa0166ca 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java @@ -18,9 +18,10 @@ package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class SocksAuthResponseDecoderTest { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SocksAuthResponseDecoderTest.class); diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java index eb290613c3..dc92a469f1 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socks; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksAuthResponseTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java index 8b8eaca6f4..f7ea485b48 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java @@ -19,11 +19,14 @@ import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.SocketUtils; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +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 SocksCmdRequestDecoderTest { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SocksCmdRequestDecoderTest.class); diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java index 619eb5c624..461ffee299 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java @@ -18,12 +18,14 @@ package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.util.CharsetUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.IDN; import java.nio.CharBuffer; -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.assertTrue; public class SocksCmdRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java index 3eab964c1c..852f915726 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java @@ -18,9 +18,13 @@ package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksCmdResponseDecoderTest { private static final InternalLogger logger = InternalLoggerFactory.getInstance(SocksCmdResponseDecoderTest.class); @@ -60,9 +64,15 @@ public class SocksCmdResponseDecoderTest { /** * Verifies that invalid bound host will fail with IllegalArgumentException during encoding. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidAddress() { - testSocksCmdResponseDecoderWithDifferentParams(SocksCmdStatus.SUCCESS, SocksAddressType.IPv4, "1", 80); + assertThrows(IllegalArgumentException.class, new Executable() { + @Override + public void execute() { + testSocksCmdResponseDecoderWithDifferentParams( + SocksCmdStatus.SUCCESS, SocksAddressType.IPv4, "1", 80); + } + }); } /** diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java index 0125ba5786..2555bc8055 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java @@ -18,12 +18,18 @@ package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.util.CharsetUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import java.net.IDN; import java.nio.CharBuffer; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksCmdResponseTest { @Test @@ -161,16 +167,21 @@ public class SocksCmdResponseTest { /** * Verifies that Response cannot be constructed with invalid IP. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidBoundAddress() { - new SocksCmdResponse(SocksCmdStatus.SUCCESS, SocksAddressType.IPv4, "127.0.0", 1000); + assertThrows(IllegalArgumentException.class, new Executable() { + @Override + public void execute() { + new SocksCmdResponse(SocksCmdStatus.SUCCESS, SocksAddressType.IPv4, "127.0.0", 1000); + } + }); } private static void assertByteBufEquals(byte[] expected, ByteBuf actual) { byte[] actualBytes = new byte[actual.readableBytes()]; actual.readBytes(actualBytes); - assertEquals("Generated response has incorrect length", expected.length, actualBytes.length); - assertArrayEquals("Generated response differs from expected", expected, actualBytes); + assertEquals(expected.length, actualBytes.length, "Generated response has incorrect length"); + assertArrayEquals(expected, actualBytes, "Generated response differs from expected"); } @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java index e9ba17fbb6..9b4749f512 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socks; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksInitRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java index 5272c9293d..7e09505e99 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socks; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SocksInitResponseTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ClientDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ClientDecoderTest.java index 33ec57a010..dca53ea91d 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ClientDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ClientDecoderTest.java @@ -16,11 +16,12 @@ package io.netty.handler.codec.socksx.v4; import io.netty.channel.embedded.EmbeddedChannel; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class Socks4ClientDecoderTest { private static final Logger logger = LoggerFactory.getLogger(Socks4ClientDecoderTest.class); diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ServerDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ServerDecoderTest.java index f3c4b6a765..940f2aba31 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ServerDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v4/Socks4ServerDecoderTest.java @@ -18,11 +18,13 @@ package io.netty.handler.codec.socksx.v4; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class Socks4ServerDecoderTest { private static final InternalLogger logger = InternalLoggerFactory.getInstance(Socks4ServerDecoderTest.class); diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequestTest.java index 583eb49d4a..3aab28332c 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandRequestTest.java @@ -15,9 +15,9 @@ */ package io.netty.handler.codec.socksx.v5; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultSocks5CommandRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponseTest.java index d8223d3740..0d72072269 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5CommandResponseTest.java @@ -16,9 +16,14 @@ package io.netty.handler.codec.socksx.v5; import io.netty.buffer.ByteBuf; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultSocks5CommandResponseTest { @Test @@ -113,17 +118,22 @@ public class DefaultSocks5CommandResponseTest { /** * Verifies that Response cannot be constructed with invalid IP. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidBoundAddress() { - new DefaultSocks5CommandResponse( - Socks5CommandStatus.SUCCESS, Socks5AddressType.IPv4, "127.0.0", 1000); + assertThrows(IllegalArgumentException.class, new Executable() { + @Override + public void execute() { + new DefaultSocks5CommandResponse( + Socks5CommandStatus.SUCCESS, Socks5AddressType.IPv4, "127.0.0", 1000); + } + }); } private static void assertByteBufEquals(byte[] expected, ByteBuf actual) { byte[] actualBytes = new byte[actual.readableBytes()]; actual.readBytes(actualBytes); - assertEquals("Generated response has incorrect length", expected.length, actualBytes.length); - assertArrayEquals("Generated response differs from expected", expected, actualBytes); + assertEquals(expected.length, actualBytes.length, "Generated response has incorrect length"); + assertArrayEquals(expected, actualBytes, "Generated response differs from expected"); } @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequestTest.java index 51ac0b0392..49e3824b91 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialRequestTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socksx.v5; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultSocks5InitialRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponseTest.java index 331d48a08b..ffc59e9562 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5InitialResponseTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socksx.v5; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultSocks5InitialResponseTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequestTest.java index ebc1f4a0b0..6c9d40fae6 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthRequestTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socksx.v5; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultSocks5PasswordAuthRequestTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponseTest.java index c62175754e..e6c477450f 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/DefaultSocks5PasswordAuthResponseTest.java @@ -15,8 +15,8 @@ */ package io.netty.handler.codec.socksx.v5; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultSocks5PasswordAuthResponseTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoderTest.java index dc76c2a510..9deae37caa 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandRequestDecoderTest.java @@ -20,13 +20,15 @@ import io.netty.util.NetUtil; import io.netty.util.internal.SocketUtils; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.IDN; import java.net.UnknownHostException; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class Socks5CommandRequestDecoderTest { private static final InternalLogger logger = diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoderTest.java index f07272851b..4f93a3780f 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5CommandResponseDecoderTest.java @@ -18,12 +18,14 @@ package io.netty.handler.codec.socksx.v5; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class Socks5CommandResponseDecoderTest { @@ -75,9 +77,14 @@ public class Socks5CommandResponseDecoderTest { /** * Verifies that invalid bound host will fail with IllegalArgumentException during encoding. */ - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidAddress() { - test(Socks5CommandStatus.SUCCESS, Socks5AddressType.IPv4, "1", 80); + assertThrows(IllegalArgumentException.class, new Executable() { + @Override + public void execute() { + test(Socks5CommandStatus.SUCCESS, Socks5AddressType.IPv4, "1", 80); + } + }); } /** diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoderTest.java index 9331e45867..c5e58f1c00 100644 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5InitialRequestDecoderTest.java @@ -18,9 +18,11 @@ package io.netty.handler.codec.socksx.v5; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.DecoderResult; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class Socks5InitialRequestDecoderTest { @Test diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoderTest.java index d775deaa9a..6effd29c0b 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthRequestDecoderTest.java @@ -16,9 +16,10 @@ package io.netty.handler.codec.socksx.v5; import io.netty.channel.embedded.EmbeddedChannel; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class Socks5PasswordAuthRequestDecoderTest { diff --git a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoderTest.java index 3ac68adba0..5c4e4a4484 100755 --- a/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socksx/v5/Socks5PasswordAuthResponseDecoderTest.java @@ -18,9 +18,10 @@ package io.netty.handler.codec.socksx.v5; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class Socks5PasswordAuthResponseDecoderTest { private static final InternalLogger logger = InternalLoggerFactory.getInstance(