diff --git a/http-service/src/main/java/net/runelite/http/service/Service.java b/http-service/src/main/java/net/runelite/http/service/Service.java index b120f91783..57d17d6ba7 100644 --- a/http-service/src/main/java/net/runelite/http/service/Service.java +++ b/http-service/src/main/java/net/runelite/http/service/Service.java @@ -67,6 +67,11 @@ public class Service implements SparkApplication private void loadDatasource() { + if (dataSource != null) + { + return; // unit test? + } + try { // It is difficult to inject things into Spark diff --git a/http-service/src/test/java/net/runelite/http/service/ServiceTest.java b/http-service/src/test/java/net/runelite/http/service/ServiceTest.java index 488250e9c8..1a5e3f0a3c 100644 --- a/http-service/src/test/java/net/runelite/http/service/ServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/ServiceTest.java @@ -28,6 +28,8 @@ import com.google.gson.Gson; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.sql.SQLException; +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; @@ -35,6 +37,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import spark.Spark; @@ -46,9 +49,12 @@ public class ServiceTest private static Service service; @BeforeClass - public static void before() + public static void before() throws SQLException { + DataSource dataSource = mock(DataSource.class, RETURNS_DEEP_STUBS); + service = new Service(); + service.setDataSource(dataSource); service.init(); Spark.awaitInitialization();