Use junit rule for mock webserver
This commit is contained in:
@@ -28,27 +28,20 @@ import java.io.IOException;
|
|||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
import okhttp3.mockwebserver.MockResponse;
|
import okhttp3.mockwebserver.MockResponse;
|
||||||
import okhttp3.mockwebserver.MockWebServer;
|
import okhttp3.mockwebserver.MockWebServer;
|
||||||
import org.junit.After;
|
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class RuneLiteAPITest
|
public class RuneLiteAPITest
|
||||||
{
|
{
|
||||||
private final MockWebServer server = new MockWebServer();
|
@Rule
|
||||||
|
public final MockWebServer server = new MockWebServer();
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() throws IOException
|
public void before() throws IOException
|
||||||
{
|
{
|
||||||
server.enqueue(new MockResponse().setBody("OK"));
|
server.enqueue(new MockResponse().setBody("OK"));
|
||||||
|
|
||||||
server.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void after() throws IOException
|
|
||||||
{
|
|
||||||
server.shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint;
|
|||||||
import net.runelite.http.api.hiscore.HiscoreResult;
|
import net.runelite.http.api.hiscore.HiscoreResult;
|
||||||
import okhttp3.mockwebserver.MockResponse;
|
import okhttp3.mockwebserver.MockResponse;
|
||||||
import okhttp3.mockwebserver.MockWebServer;
|
import okhttp3.mockwebserver.MockWebServer;
|
||||||
import org.junit.After;
|
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class HiscoreServiceTest
|
public class HiscoreServiceTest
|
||||||
@@ -118,20 +118,13 @@ public class HiscoreServiceTest
|
|||||||
+ "19301,62\n"
|
+ "19301,62\n"
|
||||||
+ "1498,5847\n";
|
+ "1498,5847\n";
|
||||||
|
|
||||||
private final MockWebServer server = new MockWebServer();
|
@Rule
|
||||||
|
public final MockWebServer server = new MockWebServer();
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() throws IOException
|
public void before() throws IOException
|
||||||
{
|
{
|
||||||
server.enqueue(new MockResponse().setBody(RESPONSE));
|
server.enqueue(new MockResponse().setBody(RESPONSE));
|
||||||
|
|
||||||
server.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void after() throws IOException
|
|
||||||
{
|
|
||||||
server.shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -32,18 +32,18 @@ import net.runelite.http.api.worlds.WorldType;
|
|||||||
import okhttp3.mockwebserver.MockResponse;
|
import okhttp3.mockwebserver.MockResponse;
|
||||||
import okhttp3.mockwebserver.MockWebServer;
|
import okhttp3.mockwebserver.MockWebServer;
|
||||||
import okio.Buffer;
|
import okio.Buffer;
|
||||||
import org.junit.After;
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.sql2o.tools.IOUtils;
|
import org.sql2o.tools.IOUtils;
|
||||||
|
|
||||||
public class WorldsServiceTest
|
public class WorldsServiceTest
|
||||||
{
|
{
|
||||||
|
@Rule
|
||||||
private final MockWebServer server = new MockWebServer();
|
public final MockWebServer server = new MockWebServer();
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() throws IOException
|
public void before() throws IOException
|
||||||
@@ -55,14 +55,6 @@ public class WorldsServiceTest
|
|||||||
buffer.write(worldData);
|
buffer.write(worldData);
|
||||||
|
|
||||||
server.enqueue(new MockResponse().setBody(buffer));
|
server.enqueue(new MockResponse().setBody(buffer));
|
||||||
|
|
||||||
server.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void after() throws IOException
|
|
||||||
{
|
|
||||||
server.shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -32,14 +32,15 @@ import java.io.InputStreamReader;
|
|||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.mockwebserver.MockResponse;
|
import okhttp3.mockwebserver.MockResponse;
|
||||||
import okhttp3.mockwebserver.MockWebServer;
|
import okhttp3.mockwebserver.MockWebServer;
|
||||||
import org.junit.After;
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class ClientConfigLoaderTest
|
public class ClientConfigLoaderTest
|
||||||
{
|
{
|
||||||
private final MockWebServer server = new MockWebServer();
|
@Rule
|
||||||
|
public final MockWebServer server = new MockWebServer();
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() throws IOException
|
public void before() throws IOException
|
||||||
@@ -51,14 +52,6 @@ public class ClientConfigLoaderTest
|
|||||||
in, Charsets.UTF_8));
|
in, Charsets.UTF_8));
|
||||||
}
|
}
|
||||||
server.enqueue(new MockResponse().setBody(response));
|
server.enqueue(new MockResponse().setBody(response));
|
||||||
|
|
||||||
server.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void after() throws IOException
|
|
||||||
{
|
|
||||||
server.shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user