From c3cd63eae1d3fb46fbd5ebf389526329addaa0fc Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Sun, 1 Nov 2020 14:12:45 +0000
Subject: [PATCH] Move http tests to Junit 5 (#6377)

---
 .../test/java/okhttp3/internal/http/HttpDateTest.kt   | 11 +++++------
 .../java/okhttp3/internal/http/StatusLineTest.java    |  6 +++---
 .../okhttp3/internal/http/ThreadInterruptTest.java    |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt b/okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt
index 825dec64e..b2356c4b6 100644
--- a/okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt
+++ b/okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt
@@ -18,16 +18,15 @@ package okhttp3.internal.http
 import java.util.Date
 import java.util.TimeZone
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 
 class HttpDateTest {
 
   private lateinit var originalDefault: TimeZone
 
-  @Before
-  @Throws(Exception::class)
+  @BeforeEach
   fun setUp() {
     originalDefault = TimeZone.getDefault()
     // The default timezone should affect none of these tests: HTTP specified GMT, so we set it to
@@ -35,7 +34,7 @@ class HttpDateTest {
     TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"))
   }
 
-  @After
+  @AfterEach
   @Throws(Exception::class)
   fun tearDown() {
     TimeZone.setDefault(originalDefault)
diff --git a/okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java b/okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java
index b8b49828f..7eec760b2 100644
--- a/okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java
+++ b/okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java
@@ -18,10 +18,10 @@ package okhttp3.internal.http;
 import java.io.IOException;
 import java.net.ProtocolException;
 import okhttp3.Protocol;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 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 StatusLineTest {
   @Test public void parse() throws IOException {
@@ -111,7 +111,7 @@ public final class StatusLineTest {
   private void assertInvalid(String statusLine) throws IOException {
     try {
       StatusLine.Companion.parse(statusLine);
-      fail();
+      fail("");
     } catch (ProtocolException expected) {
     }
   }
diff --git a/okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java b/okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java
index e5db28535..6f9ef5776 100644
--- a/okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java
+++ b/okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java
@@ -108,7 +108,7 @@ public final class ThreadInterruptTest {
     interruptLater(500);
     try {
       call.execute();
-      fail();
+      fail("");
     } catch (IOException expected) {
     }
   }