ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http-service: set content-type to application/json in various responses

Browse Source
This commit is contained in:
Adam
2017-06-12 19:11:15 -04:00
parent 2c6a19c434
commit cae29ff754
9 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
http-service/src/test/java/net/runelite/http/service/ServiceTest.java
View File

@@ -43,11 +43,14 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.Matchers;
import org.mockito.Mock;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.mockito.MockitoAnnotations;
import org.sql2o.Sql2o;
import spark.Request;
import spark.Response;
import spark.Spark;
public class ServiceTest
@@ -102,7 +105,7 @@ public class ServiceTest
HiscoreResult result = new HiscoreResult();
result.setAttack(new Skill(1, 99, 42));
when(hiscoreService.lookup("zezima")).thenReturn(result);
when(hiscoreService.lookup(Matchers.any(Request.class), Matchers.any(Response.class))).thenReturn(result);
URL url = new URL(URL_BASE + "/hiscore?username=zezima");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();

8
http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
View File

@@ -32,6 +32,9 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import spark.Request;
import spark.Response;
public class HiscoreServiceTest
{
@@ -91,7 +94,10 @@ public class HiscoreServiceTest
HiscoreService hiscores = new HiscoreService();
hiscores.setUrl(server.url("/"));
HiscoreResult result = hiscores.lookup("zezima");
Request request = mock(Request.class);
Response response = mock(Response.class);
HiscoreResult result = hiscores.lookup(request, response);
Assert.assertEquals(50, result.getAttack().getLevel());
Assert.assertEquals(159727L, result.getFishing().getExperience());