Author: hadrian Date: Sun Jan 30 04:54:56 2011 New Revision: 1065185 URL: http://svn.apache.org/viewvc?rev=1065185&view=rev Log: CAMEL-3254 Fix broken build
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java?rev=1065185&r1=1065184&r2=1065185&view=diff ============================================================================== --- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java (original) +++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java Sun Jan 30 04:54:56 2011 @@ -25,6 +25,7 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.RouteDefinition; +import org.apache.camel.spi.RoutePolicy; import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.ServiceHelper; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -107,12 +108,12 @@ public abstract class SpringScheduledRou @SuppressWarnings("unchecked") private CamelContext startRouteWithPolicy(String policyBeanName) throws Exception { CamelContext context = new DefaultCamelContext(); - ArrayList<RouteDefinition> routes = (ArrayList<RouteDefinition>) applicationContext.getBean("testRouteContext"); - if (getTestType() == TestType.SIMPLE) { - routes.get(0).setRoutePolicy((SimpleScheduledRoutePolicy) applicationContext.getBean(policyBeanName)); - } else { - routes.get(0).setRoutePolicy((CronScheduledRoutePolicy) applicationContext.getBean(policyBeanName)); - } + ArrayList<RouteDefinition> routes = (ArrayList<RouteDefinition>)applicationContext.getBean("testRouteContext"); + RoutePolicy policy = (RoutePolicy)applicationContext.getBean(policyBeanName); + assertTrue(getTestType() == TestType.SIMPLE + ? policy instanceof SimpleScheduledRoutePolicy + : policy instanceof CronScheduledRoutePolicy); + routes.get(0).routePolicy(policy); context.addRouteDefinitions(routes); context.start(); return context; Modified: camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml?rev=1065185&r1=1065184&r2=1065185&view=diff ============================================================================== --- camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml (original) +++ camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/CronPolicies.xml Sun Jan 30 04:54:56 2011 @@ -43,7 +43,7 @@ </bean> <routeContext id="testRouteContext" xmlns="http://camel.apache.org/schema/spring"> - <route id="testRoute" routePolicyRef="policy"> + <route id="testRoute"> <from uri="direct:start"/> <to uri="mock:success"/> </route> Modified: camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml?rev=1065185&r1=1065184&r2=1065185&view=diff ============================================================================== --- camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml (original) +++ camel/trunk/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SimplePolicies.xml Sun Jan 30 04:54:56 2011 @@ -51,7 +51,7 @@ </bean> <routeContext id="testRouteContext" xmlns="http://camel.apache.org/schema/spring"> - <route id="testRoute" routePolicyRef="policy"> + <route id="testRoute"> <from uri="direct:start"/> <to uri="mock:success"/> </route>