From 68df5a947782ef4f6de98a469c009ffafb97900a Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 1 Nov 2020 14:11:03 +0000 Subject: [PATCH] Move ws tests to Junit 5 (#6381) * Move ws tests to Junit 5 * Move ws tests to Junit 5 --- .../internal/ws/MessageDeflaterInflaterTest.kt | 4 ++-- .../okhttp3/internal/ws/RealWebSocketTest.java | 18 +++++++++--------- .../internal/ws/WebSocketExtensionsTest.kt | 2 +- .../okhttp3/internal/ws/WebSocketHttpTest.java | 2 +- .../internal/ws/WebSocketReaderTest.java | 6 +++--- .../internal/ws/WebSocketWriterTest.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt index 5438dace0..c5d458018 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt +++ b/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt @@ -22,8 +22,8 @@ import okio.ByteString import okio.ByteString.Companion.decodeHex import okio.ByteString.Companion.encodeUtf8 import org.assertj.core.api.Assertions.assertThat -import org.junit.Assert.fail -import org.junit.Test +import org.junit.jupiter.api.Assertions.fail +import org.junit.jupiter.api.Test internal class MessageDeflaterInflaterTest { @Test fun `inflate golden value`() { diff --git a/okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java b/okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java index 04cd0597e..5868f45ca 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java +++ b/okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java @@ -30,15 +30,15 @@ import okhttp3.internal.concurrent.TaskRunner; import okio.ByteString; import okio.Okio; import okio.Pipe; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static okhttp3.internal.ws.RealWebSocket.DEFAULT_MINIMUM_DEFLATE_SIZE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Offset.offset; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public final class RealWebSocketTest { // NOTE: Fields are named 'client' and 'server' for cognitive simplicity. This differentiation has @@ -52,12 +52,12 @@ public final class RealWebSocketTest { private TestStreams client = new TestStreams(true, server2client, client2Server); private TestStreams server = new TestStreams(false, client2Server, server2client); - @Before public void setUp() throws IOException { + @BeforeEach public void setUp() throws IOException { client.initWebSocket(random, 0); server.initWebSocket(random, 0); } - @After public void tearDown() throws Exception { + @AfterEach public void tearDown() throws Exception { client.listener.assertExhausted(); server.listener.assertExhausted(); server.getSource().close(); @@ -274,7 +274,7 @@ public final class RealWebSocketTest { client.listener.assertFailure(IOException.class, "source is closed"); } - @Ignore // TODO(jwilson): come up with a way to test unchecked exceptions on the writer thread. + @Disabled // TODO(jwilson): come up with a way to test unchecked exceptions on the writer thread. @Test public void closeMessageAndConnectionCloseThrowingDoesNotMaskOriginal() throws IOException { client.getSink().close(); client.closeThrows = true; @@ -284,7 +284,7 @@ public final class RealWebSocketTest { assertThat(client.closed).isTrue(); } - @Ignore // TODO(jwilson): come up with a way to test unchecked exceptions on the writer thread. + @Disabled // TODO(jwilson): come up with a way to test unchecked exceptions on the writer thread. @Test public void peerConnectionCloseThrowingPropagates() throws IOException { client.closeThrows = true; diff --git a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt index c0b62e588..cdcf521a9 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt +++ b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt @@ -17,7 +17,7 @@ package okhttp3.internal.ws import okhttp3.Headers.Companion.headersOf import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test class WebSocketExtensionsTest { @Test diff --git a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java index a6f4bf0ae..b8e0888d7 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java +++ b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java @@ -59,7 +59,7 @@ import static okhttp3.TestUtil.repeat; import static okhttp3.tls.internal.TlsUtil.localhost; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Offset.offset; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; @Flaky public final class WebSocketHttpTest { diff --git a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java index 7b5c55316..fa3625b8f 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java +++ b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java @@ -22,8 +22,8 @@ import java.util.Random; import okhttp3.internal.Util; import okio.Buffer; import okio.ByteString; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -43,7 +43,7 @@ public final class WebSocketReaderTest { final WebSocketReader clientReaderWithCompression = new WebSocketReader(true, data, callback.asFrameCallback(), true, false); - @After public void tearDown() { + @AfterEach public void tearDown() { callback.assertExhausted(); } diff --git a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java index 0485d3c00..4a123a607 100644 --- a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java +++ b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java @@ -31,7 +31,7 @@ import static okhttp3.internal.ws.WebSocketProtocol.OPCODE_TEXT; import static okhttp3.internal.ws.WebSocketProtocol.PAYLOAD_BYTE_MAX; import static okhttp3.internal.ws.WebSocketProtocol.PAYLOAD_SHORT_MAX; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public final class WebSocketWriterTest { private final Buffer data = new Buffer();