fixing tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e9db39cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e9db39cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e9db39cd Branch: refs/heads/master Commit: e9db39cd57ae922bb2efc0072c94005c7ff67b67 Parents: b971204 Author: Nicola Ferraro <[email protected]> Authored: Mon Dec 12 18:05:47 2016 +0100 Committer: Nicola Ferraro <[email protected]> Committed: Tue Dec 13 09:20:58 2016 +0100 ---------------------------------------------------------------------- .../servlet/springboot/ServletMappingAutoConfigurationTest.java | 2 ++ .../component/servlet/springboot/ServletMappingDisablingTest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e9db39cd/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfigurationTest.java b/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfigurationTest.java index 378cffb..2246780 100644 --- a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfigurationTest.java +++ b/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfigurationTest.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -36,6 +37,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootApplication +@DirtiesContext @ContextConfiguration(classes = {ServletMappingAutoConfiguration.class, CamelAutoConfiguration.class}) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ServletMappingAutoConfigurationTest { http://git-wip-us.apache.org/repos/asf/camel/blob/e9db39cd/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingDisablingTest.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingDisablingTest.java b/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingDisablingTest.java index 5454ff7..4bd1854 100644 --- a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingDisablingTest.java +++ b/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/ServletMappingDisablingTest.java @@ -20,13 +20,13 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -35,6 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootApplication +@DirtiesContext @ContextConfiguration(classes = ServletMappingDisablingTest.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "camel.component.servlet.mapping.enabled=false"
