http-service: add account api

http-service/src/test/java/net/runelite/http/service/ServiceTest.java

@@ -35,7 +35,6 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import javax.servlet.ServletContext;
-import javax.sql.DataSource;
 import net.runelite.http.api.hiscore.HiscoreResult;
 import net.runelite.http.api.hiscore.Skill;
 import net.runelite.http.service.hiscore.HiscoreService;
@@ -48,23 +47,32 @@ 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.Spark;
 
 public class ServiceTest
 {
 	private static final String URL_BASE = "http://localhost:4567";
-	
+
 	private Service service;
-	
+
 	@Bind
 	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
-	@Named("Runelite JDBC")
-	private DataSource dataSource;
-	
+	@Named("Runelite SQL2O")
+	private Sql2o sql2o;
+
+	@Bind
+	@Named("OAuth Client ID")
+	private String clientId = "test";
+
+	@Bind
+	@Named("OAuth Client Secret")
+	private String clientSecret = "test";
+
 	@Bind
 	@Mock
 	private HiscoreService hiscoreService;
-	
+
 	@Before
 	public void before()
 	{
@@ -73,38 +81,38 @@ public class ServiceTest
 		// Inject everything in the test object
 		Injector injector = Guice.createInjector(BoundFieldModule.of(this));
 		injector.injectMembers(this);
-		
+
 		ServletContextLogger.setServletContext(mock(ServletContext.class));
-		
+
 		service = injector.getInstance(Service.class);
 		service.setupRoutes();
-		
+
 		Spark.awaitInitialization();
 	}
-	
+
 	@After
 	public void after()
 	{
 		Spark.stop();
 	}
-	
+
 	@Test
 	public void testInit() throws Exception
 	{
 		HiscoreResult result = new HiscoreResult();
 		result.setAttack(new Skill(1, 99, 42));
-		
+
 		when(hiscoreService.lookup("zezima")).thenReturn(result);
-		
+
 		URL url = new URL(URL_BASE + "/hiscore?username=zezima");
 		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 		connection.setRequestMethod("GET");
 		connection.connect();
-		
+
 		Gson gson = new Gson();
 		HiscoreResult res = gson.fromJson(new InputStreamReader(connection.getInputStream()), HiscoreResult.class);
-		
+
 		Assert.assertEquals(result, res);
 	}
-	
+
 }