camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r791449 - in /camel/trunk/components: camel-cxf/src/test/java/org/apache/camel/component/cxf/ camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ camel-cxf/src/test/resources/org/apache/camel/component/cxf/ camel-guice/src/tes...
Date Mon, 06 Jul 2009 11:40:47 GMT
Author: davsclaus
Date: Mon Jul  6 11:40:47 2009
New Revision: 791449

URL: http://svn.apache.org/viewvc?rev=791449&view=rev
Log:
CAMEL-1756: More test fixes due endpoint resolution changes.

Modified:
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
    camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
    camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisUnknownStatementTypeTest.java
    camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
    camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
Mon Jul  6 11:40:47 2009
@@ -25,13 +25,11 @@
 import org.apache.camel.wsdl_first.Person;
 import org.apache.camel.wsdl_first.PersonService;
 import org.apache.camel.wsdl_first.UnknownPersonFault;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfWsdlFirstPayloadModeTest extends CxfWsdlFirstTest {
 
-
     @Override
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml");
@@ -90,8 +88,6 @@
         assertEquals(8, toHandler.getGetHeadersCount());
         assertEquals(10, toHandler.getMessageCount());
         assertEquals(6, toHandler.getFaultCount());
-
     }
-    
 
 }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
Mon Jul  6 11:40:47 2009
@@ -28,22 +28,23 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
 import org.apache.camel.wsdl_first.JaxwsTestHandler;
 import org.apache.camel.wsdl_first.Person;
 import org.apache.camel.wsdl_first.PersonImpl;
 import org.apache.camel.wsdl_first.PersonService;
 import org.apache.camel.wsdl_first.UnknownPersonFault;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.jaxws.EndpointImpl;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfWsdlFirstTest extends CamelSpringTestSupport {
 
+    @Override
+    public boolean isUseRouteBuilder() {
+        return false;
+    }
+
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/WsdlFirstBeans.xml");
     }
@@ -59,15 +60,6 @@
         Endpoint.publish(address, implementor);
     }
 
-    
-
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-            }
-        };
-    }
-
     @Test
     public void testInvokingServiceFromCXFClient() throws Exception {
 
@@ -113,7 +105,6 @@
         assertEquals(7, toHandler.getGetHeadersCount());
         assertEquals(8, toHandler.getMessageCount());
         assertEquals(6, toHandler.getFaultCount());
-
     }
 
     @Test

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
Mon Jul  6 11:40:47 2009
@@ -76,7 +76,7 @@
 
         assertNotNull("the camel context which get from camel conduit is not null", context);
         assertEquals("get the wrong camel context", context.getName(), "conduit_context");
-        assertEquals(context.getRoutes().get(0).getEndpoint().getEndpointUri(), "direct:EndpointA");
+        assertEquals("direct://EndpointA", context.getRoutes().get(0).getEndpoint().getEndpointUri());
 
         endpointInfo.setAddress("camel://direct:EndpointC");
         endpointInfo.setName(testEndpointQNameB);
@@ -84,7 +84,7 @@
         context = conduit.getCamelContext();
         assertNotNull("the camel context which get from camel conduit is not null", context);
         assertEquals("get the wrong camel context", context.getName(), "context");
-        assertEquals(context.getRoutes().get(0).getEndpoint().getEndpointUri(), "direct:EndpointC");
+        assertEquals("direct://EndpointC", context.getRoutes().get(0).getEndpoint().getEndpointUri());
         bus.shutdown(false);
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
(original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
Mon Jul  6 11:40:47 2009
@@ -62,6 +62,7 @@
     </bean>
 
     <bean id="myRedeliveryPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
+        <property name="maximumRedeliveries" value="5"/>
         <property name="redeliverDelay" value="0"/>
     </bean>
 

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
(original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml
Mon Jul  6 11:40:47 2009
@@ -62,6 +62,7 @@
     </bean>
 
     <bean id="myRedeliveryPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
+        <property name="maximumRedeliveries" value="5"/>
         <property name="redeliverDelay" value="0"/>
     </bean>
 

Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
(original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
Mon Jul  6 11:40:47 2009
@@ -63,7 +63,7 @@
 
         MyBean bean = injector.getInstance(MyBean.class);
         assertNotNull("bean.endpoint", bean.endpoint);
-        assertEquals("bean.endpoint.uri", "mock:foo", bean.endpoint.getEndpointUri());
+        assertEquals("bean.endpoint.uri", "mock://foo", bean.endpoint.getEndpointUri());
 
         GuiceTest.assertCamelContextRunningThenCloseInjector(injector);
     }

Modified: camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisUnknownStatementTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisUnknownStatementTypeTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisUnknownStatementTypeTest.java
(original)
+++ camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisUnknownStatementTypeTest.java
Mon Jul  6 11:40:47 2009
@@ -34,7 +34,7 @@
             fail("Should have thrown an IllegalArgumentException");
         } catch (CamelExecutionException e) {
             assertIsInstanceOf(FailedToCreateProducerException.class, e.getCause());
-            assertEquals("statementType must be specified on: Endpoint[ibatis:selectAllAccounts]",
e.getCause().getCause().getMessage());
+            assertEquals("statementType must be specified on: Endpoint[ibatis://selectAllAccounts]",
e.getCause().getCause().getMessage());
         }
     }
 

Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
(original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
Mon Jul  6 11:40:47 2009
@@ -83,8 +83,8 @@
         
         JpaTraceEventMessage db = (JpaTraceEventMessage) list.get(0);
         assertNotNull(db.getId());
-        assertEquals("direct:start", db.getFromEndpointUri());
-        assertEquals("mock:result", db.getToNode());
+        assertEquals("direct://start", db.getFromEndpointUri());
+        assertEquals("mock://result", db.getToNode());
     }
 
     protected void cleanupRepository() {

Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java?rev=791449&r1=791448&r2=791449&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
(original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
Mon Jul  6 11:40:47 2009
@@ -32,7 +32,7 @@
             fail("Should have thrown a ResolveEndpointFailedException");
         } catch (ResolveEndpointFailedException e) {
             assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException);
-            assertEquals("Unrecognised MINA protocol: xxx for uri: mina:xxx://localhost:8080",
e.getCause().getMessage());
+            assertEquals("Unrecognised MINA protocol: xxx for uri: mina://xxx://localhost:8080",
e.getCause().getMessage());
         }
     }
 
@@ -43,7 +43,7 @@
             fail("Should have thrown a ResolveEndpointFailedException");
         } catch (ResolveEndpointFailedException e) {
             assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException);
-            assertEquals("Unrecognised MINA protocol: null for uri: mina:tcp//localhost:8080",
e.getCause().getMessage());
+            assertEquals("Unrecognised MINA protocol: null for uri: mina://tcp//localhost:8080",
e.getCause().getMessage());
         }
     }
 



Mime
View raw message