svn commit: r698685 - in /activemq/camel/trunk: camel-core/src/test/java/org/apache/camel/model/ examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/ tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/

[ha...@apache.org]

Author: hadrian
Date: Wed Sep 24 11:46:39 2008
New Revision: 698685

URL: http://svn.apache.org/viewvc?rev=698685&view=rev
Log:
Minor test fixes.

Modified:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
    activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
    activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=698685&r1=698684&r2=698685&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Wed Sep 24 11:46:39 2008
@@ -176,7 +176,8 @@
         assertInterceptorRefs(route, "interceptor1", "interceptor2");
     }
 
-    public void testParseRouteWithChoiceXml() throws Exception {
+    @SuppressWarnings("unchecked")
+	public void testParseRouteWithChoiceXml() throws Exception {
         RouteType route = assertOneRoute("routeWithChoice.xml");
         assertFrom(route, "seda:a");
 
@@ -237,6 +238,9 @@
 
     public void testLoop() throws Exception {
         RouteType route = assertOneRoute("loop.xml");
+        LoopType loop = assertOneProcessorInstanceOf(LoopType.class, route);
+        assertNotNull(loop.getExpression());
+        assertEquals("constant", loop.getExpression().getLanguage());
     }
 
     // Implementation methods
@@ -261,7 +265,7 @@
         assertEquals(text, uri, value.getUri());
     }
 
-    protected void assertTo(String message, ProcessorType processor, String uri) {
+    protected void assertTo(String message, ProcessorType<?> processor, String uri) {
         ToType value = assertIsInstanceOf(ToType.class, processor);
         String text = message + "To URI";
         log.info("Testing: " + text + " is equal to: " + uri + " for processor: " + processor);

Modified: activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=698685&r1=698684&r2=698685&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java (original)
+++ activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java Wed Sep 24 11:46:39 2008
@@ -22,15 +22,9 @@
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
-import org.apache.camel.spring.Main;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 
 

Modified: activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=698685&r1=698684&r2=698685&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Wed Sep 24 11:46:39 2008
@@ -22,7 +22,6 @@
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.cxf.CxfConstants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.interceptor.Tracer;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,11 +72,5 @@
             assertEquals("Should get the request", "Hello form Willem", result);
             assertEquals("Should get the header", "greetMe", exchange.getIn().getHeader("Operation"));
         }
-
     }
-
-
-
-
-
 }