diff --git a/web/src/test/java/lcsb/mapviewer/web/EndPointsInputValidationTests.java b/web/src/test/java/lcsb/mapviewer/web/EndPointsInputValidationTests.java index 054024c7228933e5cccb1331389386a76eb8d79f..36bcefe3963592f744400026b3d0e85e77a90407 100644 --- a/web/src/test/java/lcsb/mapviewer/web/EndPointsInputValidationTests.java +++ b/web/src/test/java/lcsb/mapviewer/web/EndPointsInputValidationTests.java @@ -3,25 +3,25 @@ package lcsb.mapviewer.web; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import java.net.URI; import java.util.*; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; import org.apache.logging.log4j.*; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configurator; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.web.servlet.RequestBuilder; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import lcsb.mapviewer.api.BaseController; - @RunWith(SpringJUnit4ClassRunner.class) public class EndPointsInputValidationTests extends ControllerIntegrationTest { @@ -34,10 +34,24 @@ public class EndPointsInputValidationTests extends ControllerIntegrationTest { @Autowired public RequestMappingHandlerMapping requestMappingHandlerMapping; + @Autowired + ServletContext container; + + @Before + public void setUp() throws Exception { + Configurator.setAllLevels(LogManager.getRootLogger().getName(), Level.FATAL); + } + + @After + public void tearDown() throws Exception { + String file = "src/test/resources/log4j2.properties"; + LoggerContext context = (org.apache.logging.log4j.core.LoggerContext) org.apache.logging.log4j.LogManager + .getContext(false); + context.setConfigLocation(new URI(file)); + } + @Test public void testResponseStatusCodeFromEndpoints() throws Exception { - Configurator.setAllLevels(LogManager.getRootLogger().getName(), Level.FATAL); - for (RequestMappingInfo t : requestMappingHandlerMapping.getHandlerMethods().keySet()) { for (String url : t.getPatternsCondition().getPatterns()) { for (RequestMethod method : t.getMethodsCondition().getMethods()) { @@ -45,7 +59,6 @@ public class EndPointsInputValidationTests extends ControllerIntegrationTest { } } } - Configurator.setAllLevels(LogManager.getRootLogger().getName(), Level.INFO); } private void testUrl(String url, RequestMethod method) throws Exception {