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

---
 .../test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt | 2 +-
 .../internal/concurrent/TaskRunnerRealBackendTest.kt        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt
index 8d84e3aa6..593f02d4e 100644
--- a/okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt
+++ b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt
@@ -16,7 +16,7 @@
 package okhttp3.internal.concurrent
 
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 class TaskLoggerTest {
   @Test fun formatTime() {
diff --git a/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt
index f920f0758..ac8c18495 100644
--- a/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt
+++ b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt
@@ -21,8 +21,8 @@ import java.util.concurrent.ThreadFactory
 import java.util.concurrent.TimeUnit
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.data.Offset
-import org.junit.After
-import org.junit.Test
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
 
 /**
  * Integration test to confirm that [TaskRunner] works with a real backend. Business logic is all
@@ -49,7 +49,7 @@ class TaskRunnerRealBackendTest {
   private val taskRunner = TaskRunner(backend)
   private val queue = taskRunner.newQueue()
 
-  @After fun tearDown() {
+  @AfterEach fun tearDown() {
     backend.shutdown()
   }