Author: jstrachan Date: Wed Sep 5 15:08:00 2012 New Revision: 1381216 URL: http://svn.apache.org/viewvc?rev=1381216&view=rev Log: simplfied integration test using @CamelStartup
Modified: camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java Modified: camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java?rev=1381216&r1=1381215&r2=1381216&view=diff ============================================================================== --- camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java (original) +++ camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java Wed Sep 5 15:08:00 2012 @@ -21,6 +21,7 @@ import javax.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.cdi.CamelStartup; import org.apache.camel.cdi.Mock; import org.apache.camel.component.cdi.internal.CamelExtension; import org.apache.camel.component.mock.MockEndpoint; @@ -44,13 +45,11 @@ public class IntegrationTest { MyRoutes config; @Inject - CamelContext camelContext; - - @Inject @Mock MockEndpoint result; @Produces + @CamelStartup public RouteBuilder createRoutes() { return new RouteBuilder() { public void configure() { @@ -61,17 +60,9 @@ public class IntegrationTest { @Test public void integrationTest() throws Exception { - assertNotNull("CamelContext not injected!", camelContext); - assertTrue("CamelContext is started", camelContext.getStatus().isStarted()); - assertNotNull("config not injected!", config); assertNotNull("MockEndpoint result not injected!", result); - //camelContext.setTracing(true); - - // TODO we could maybe auto-register this? - camelContext.addRoutes(createRoutes()); - result.expectedMessageCount(2); result.assertIsSatisfied(); }