You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2016/11/28 11:28:08 UTC
[2/3] camel git commit: CAMEL-10536: fixing test configuration
CAMEL-10536: fixing test configuration
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/534cfd3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/534cfd3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/534cfd3b
Branch: refs/heads/master
Commit: 534cfd3b1c8ae81d0d7e999f226ae439acd5de02
Parents: ca0f405
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Nov 28 12:22:32 2016 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Nov 28 12:24:12 2016 +0100
----------------------------------------------------------------------
.../servlet/springboot/ServletMappingAutoConfigurationTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/534cfd3b/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 43f25bf..31a9202 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.servlet.springboot;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
@@ -35,7 +36,7 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootApplication
-@ContextConfiguration(classes = ServletMappingAutoConfiguration.class)
+@ContextConfiguration(classes = {ServletMappingAutoConfiguration.class, CamelAutoConfiguration.class})
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@Ignore("TODO: test fails")
public class ServletMappingAutoConfigurationTest {