android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-14 07:22:20 +03:00
Code Releases Activity

Move ws tests to Junit 5 (#6381)

Browse Source 
* Move ws tests to Junit 5

* Move ws tests to Junit 5
This commit is contained in:
Yuri Schimke
2020-11-01 14:11:03 +00:00
committed by GitHub
parent edc3247c5b
commit 68df5a9477
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt
View File

@@ -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`() {

18
okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java
View File

@@ -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;

2
okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt
View File

@@ -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

2
okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java
View File

@@ -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 {

6
okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java
View File

@@ -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();
}

2
okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java
View File

@@ -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();