Author: ningjiang
Date: Tue Mar 22 04:38:04 2011
New Revision: 1084067

URL: http://svn.apache.org/viewvc?rev=1084067&view=rev
Log:
CAMEL-3796 Polish the CxfRsProducerAddressOverrideTest

Modified:
    
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
    
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java

Modified: 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java?rev=1084067&r1=1084066&r2=1084067&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
 Tue Mar 22 04:38:04 2011
@@ -16,15 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import java.util.List;
-
 import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
-import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -34,97 +27,8 @@ public class CxfRsProducerAddressOverrid
         return new 
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml");
     }
     
-    @Override
-    public void testGetConstumerWithClientProxyAPI() {
-        // START SNIPPET: ProxyExample
-        Exchange exchange = template.send("direct://proxy", new Processor() {
-
-            public void process(Exchange exchange) throws Exception {
-                exchange.setPattern(ExchangePattern.InOut);
-                Message inMessage = exchange.getIn();
-                
-                inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
-                                    "http://localhost:9002";);
-
-                // set the operation name 
-                inMessage.setHeader(CxfConstants.OPERATION_NAME, 
"getCustomer");
-                // using the proxy client API
-                inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, 
Boolean.FALSE);
-                // set the parameters , if you just have one parameter 
-                // camel will put this object into an Object[] itself
-                inMessage.setBody("123");
-            }
-            
-        });
-     
-        // get the response message 
-        Customer response = (Customer) exchange.getOut().getBody();
-        
-        assertNotNull("The response should not be null ", response);
-        assertEquals("Get a wrong customer id ", 
String.valueOf(response.getId()), "123");
-        assertEquals("Get a wrong customer name", response.getName(), "John");
-        // END SNIPPET: ProxyExample     
-    }
-    
-    @Test
-    public void testGetConstumersWithClientProxyAPI() {
-        Exchange exchange = template.send("direct://proxy", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.setPattern(ExchangePattern.InOut);
-                Message inMessage = exchange.getIn();
-                inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
-                    "http://localhost:9002";);
-                // set the operation name 
-                inMessage.setHeader(CxfConstants.OPERATION_NAME, 
"getCustomers");
-                // using the proxy client API
-                inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, 
Boolean.FALSE);
-                // set the parameters , if you just have one parameter 
-                // camel will put this object into an Object[] itself
-                inMessage.setBody(null);
-            }
-        });
-     
-        // get the response message 
-        List<Customer> response = (List<Customer>) exchange.getOut().getBody();
-        
-        assertNotNull("The response should not be null ", response);
-        assertEquals("Get a wrong customer id ", 
String.valueOf(response.get(0).getId()), "113");
-        assertEquals("Get a wrong customer name", response.get(0).getName(), 
"Dan");
+    protected void setupDestinationURL(Message inMessage) {
+        inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
+            "http://localhost:9002";);
     }
-    
-    @Override
-    public void testGetConstumerWithHttpCentralClientAPI() {
-     // START SNIPPET: HttpExample
-        Exchange exchange = template.send("direct://http", new Processor() {
-
-            public void process(Exchange exchange) throws Exception {
-                exchange.setPattern(ExchangePattern.InOut);
-                Message inMessage = exchange.getIn();
-                
-                inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
-                    "http://localhost:9002";);
-                
-                // using the http central client API
-                inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, 
Boolean.TRUE);
-                // set the Http method
-                inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
-                // set the relative path
-                inMessage.setHeader(Exchange.HTTP_PATH, 
"/customerservice/customers/123");                
-                // Specify the response class , cxfrs will use InputStream as 
the response object type 
-                inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, 
Customer.class);
-                // since we use the Get method, so we don't need to set the 
message body
-                inMessage.setBody(null);                
-            }
-            
-        });
-     
-        // get the response message 
-        Customer response = (Customer) exchange.getOut().getBody();
-        
-        assertNotNull("The response should not be null ", response);
-        assertEquals("Get a wrong customer id ", 
String.valueOf(response.getId()), "123");
-        assertEquals("Get a wrong customer name", response.getName(), "John");
-        // END SNIPPET: HttpExample 
-    }
-
 }

Modified: 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java?rev=1084067&r1=1084066&r2=1084067&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
 Tue Mar 22 04:38:04 2011
@@ -47,6 +47,10 @@ public class CxfRsProducerTest extends C
         return new 
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml");
     }
     
+    protected void setupDestinationURL(Message inMessage) {
+        // do nothing here
+    }
+    
     @Test
     public void testGetConstumerWithClientProxyAPI() {
         // START SNIPPET: ProxyExample
@@ -54,6 +58,7 @@ public class CxfRsProducerTest extends C
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
                 Message inMessage = exchange.getIn();
+                setupDestinationURL(inMessage);
                 // set the operation name 
                 inMessage.setHeader(CxfConstants.OPERATION_NAME, 
"getCustomer");
                 // using the proxy client API
@@ -79,6 +84,7 @@ public class CxfRsProducerTest extends C
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
                 Message inMessage = exchange.getIn();
+                setupDestinationURL(inMessage);
                 // set the operation name 
                 inMessage.setHeader(CxfConstants.OPERATION_NAME, 
"getCustomers");
                 // using the proxy client API
@@ -104,6 +110,7 @@ public class CxfRsProducerTest extends C
             public void process(Exchange exchange) throws Exception {
                 exchange.setPattern(ExchangePattern.InOut);
                 Message inMessage = exchange.getIn();
+                setupDestinationURL(inMessage);
                 // using the http central client API
                 inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, 
Boolean.TRUE);
                 // set the Http method


Reply via email to