From 9e780d58c8b820e8da65f277732799eed135e645 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Mon, 31 May 2021 11:34:59 -0400
Subject: [PATCH] Use junit rule for mock webserver

---
 .../net/runelite/http/api/RuneLiteAPITest.java     | 13 +++----------
 .../http/service/hiscore/HiscoreServiceTest.java   | 13 +++----------
 .../http/service/worlds/WorldsServiceTest.java     | 14 +++-----------
 .../runelite/client/rs/ClientConfigLoaderTest.java | 13 +++----------
 4 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/http-api/src/test/java/net/runelite/http/api/RuneLiteAPITest.java b/http-api/src/test/java/net/runelite/http/api/RuneLiteAPITest.java
index 42fadf4363..d1fd3562bd 100644
--- a/http-api/src/test/java/net/runelite/http/api/RuneLiteAPITest.java
+++ b/http-api/src/test/java/net/runelite/http/api/RuneLiteAPITest.java
@@ -28,27 +28,20 @@ import java.io.IOException;
 import okhttp3.Request;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.junit.After;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class RuneLiteAPITest
 {
-	private final MockWebServer server = new MockWebServer();
+	@Rule
+	public final MockWebServer server = new MockWebServer();
 
 	@Before
 	public void before() throws IOException
 	{
 		server.enqueue(new MockResponse().setBody("OK"));
-
-		server.start();
-	}
-
-	@After
-	public void after() throws IOException
-	{
-		server.shutdown();
 	}
 
 	@Test
diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
index fb84ee63a4..f22d2c3f5d 100644
--- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
+++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
@@ -29,9 +29,9 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint;
 import net.runelite.http.api.hiscore.HiscoreResult;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class HiscoreServiceTest
@@ -118,20 +118,13 @@ public class HiscoreServiceTest
 			+ "19301,62\n"
 			+ "1498,5847\n";
 
-	private final MockWebServer server = new MockWebServer();
+	@Rule
+	public final MockWebServer server = new MockWebServer();
 
 	@Before
 	public void before() throws IOException
 	{
 		server.enqueue(new MockResponse().setBody(RESPONSE));
-
-		server.start();
-	}
-
-	@After
-	public void after() throws IOException
-	{
-		server.shutdown();
 	}
 
 	@Test
diff --git a/http-service/src/test/java/net/runelite/http/service/worlds/WorldsServiceTest.java b/http-service/src/test/java/net/runelite/http/service/worlds/WorldsServiceTest.java
index a083bba0df..6d55fc52aa 100644
--- a/http-service/src/test/java/net/runelite/http/service/worlds/WorldsServiceTest.java
+++ b/http-service/src/test/java/net/runelite/http/service/worlds/WorldsServiceTest.java
@@ -32,18 +32,18 @@ import net.runelite.http.api.worlds.WorldType;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okio.Buffer;
-import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.sql2o.tools.IOUtils;
 
 public class WorldsServiceTest
 {
-
-	private final MockWebServer server = new MockWebServer();
+	@Rule
+	public final MockWebServer server = new MockWebServer();
 
 	@Before
 	public void before() throws IOException
@@ -55,14 +55,6 @@ public class WorldsServiceTest
 		buffer.write(worldData);
 
 		server.enqueue(new MockResponse().setBody(buffer));
-
-		server.start();
-	}
-
-	@After
-	public void after() throws IOException
-	{
-		server.shutdown();
 	}
 
 	@Test
diff --git a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
index 6ee1ecdf33..ae5572f6ab 100644
--- a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
@@ -32,14 +32,15 @@ import java.io.InputStreamReader;
 import okhttp3.OkHttpClient;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class ClientConfigLoaderTest
 {
-	private final MockWebServer server = new MockWebServer();
+	@Rule
+	public final MockWebServer server = new MockWebServer();
 
 	@Before
 	public void before() throws IOException
@@ -51,14 +52,6 @@ public class ClientConfigLoaderTest
 				in, Charsets.UTF_8));
 		}
 		server.enqueue(new MockResponse().setBody(response));
-
-		server.start();
-	}
-
-	@After
-	public void after() throws IOException
-	{
-		server.shutdown();
 	}
 
 	@Test