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

http-service: fix test. irritatingly can't make slf4j-simple the only slf4j implementation during tests

Browse Source
This commit is contained in:
Adam
2017-04-20 15:02:31 -04:00
parent 7c9560cbcf
commit ea9e17a472
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
http-service/pom.xml
View File

@@ -78,6 +78,7 @@
<groupId>com.commongroundpublishing</groupId> <groupId>com.commongroundpublishing</groupId>
<artifactId>slf4j-servletcontext</artifactId> <artifactId>slf4j-servletcontext</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

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

@@ -24,6 +24,7 @@
*/ */
package net.runelite.http.service; package net.runelite.http.service;
import com.commongroundpublishing.slf4j.impl.ServletContextLogger;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -33,6 +34,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import javax.servlet.ServletContext;
import javax.sql.DataSource; import javax.sql.DataSource;
import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.HiscoreResult;
import net.runelite.http.api.hiscore.Skill; import net.runelite.http.api.hiscore.Skill;
@@ -43,6 +45,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Answers; import org.mockito.Answers;
import org.mockito.Mock; import org.mockito.Mock;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import spark.Spark; import spark.Spark;
@@ -71,6 +74,8 @@ public class ServiceTest
Injector injector = Guice.createInjector(BoundFieldModule.of(this)); Injector injector = Guice.createInjector(BoundFieldModule.of(this));
injector.injectMembers(this); injector.injectMembers(this);
ServletContextLogger.setServletContext(mock(ServletContext.class));
service = injector.getInstance(Service.class); service = injector.getInstance(Service.class);
service.setupRoutes(); service.setupRoutes();