You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by wt...@apache.org on 2009/08/06 05:08:22 UTC

svn commit: r801504 - in /camel/trunk/components/camel-cxf: pom.xml src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java

Author: wtam
Date: Thu Aug  6 03:08:22 2009
New Revision: 801504

URL: http://svn.apache.org/viewvc?rev=801504&view=rev
Log:
made CxfBeanTest more reliable.  it used to fail if testPutConsumer gets run first

Modified:
    camel/trunk/components/camel-cxf/pom.xml
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java

Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=801504&r1=801503&r2=801504&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Thu Aug  6 03:08:22 2009
@@ -228,12 +228,11 @@
        <scope>test</scope>
      </dependency>
 
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.6</version>
-		<scope>test</scope>
-	</dependency>
+    <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.easymock</groupId>

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java?rev=801504&r1=801503&r2=801504&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java Thu Aug  6 03:08:22 2009
@@ -42,7 +42,7 @@
  */
 @ContextConfiguration
 public class CxfBeanTest extends AbstractJUnit4SpringContextTests {
-    private static final String PUT_REQUEST = "<Customer><name>Mary</name><id>123</id></Customer>";
+    private static final String PUT_REQUEST = "<Customer><name>Mary</name><id>113</id></Customer>";
     private static final String POST_REQUEST = "<Customer><name>Jack</name></Customer>";
     
     @Autowired

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java?rev=801504&r1=801503&r2=801504&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java Thu Aug  6 03:08:22 2009
@@ -116,6 +116,11 @@
         c.setId(123);
         customers.put(c.getId(), c);
 
+        c = new Customer();
+        c.setName("Dan");
+        c.setId(113);
+        customers.put(c.getId(), c);
+
         Order o = new Order();
         o.setDescription("order 223");
         o.setId(223);