svn commit: r938839 - in /camel/trunk/components: camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java camel-web/src/main/java/org/apache/camel/web/model/jaxb.index

[ni...@apache.org]

Author: ningjiang
Date: Wed Apr 28 09:43:21 2010
New Revision: 938839

URL: http://svn.apache.org/viewvc?rev=938839&view=rev
Log:
CAMEL-2679 polish the unit test

Removed:
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/jaxb.index
Modified:
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java?rev=938839&r1=938838&r2=938839&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java Wed Apr 28 09:43:21 2010
@@ -19,6 +19,7 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http.HttpMethods;
 import org.apache.camel.component.jetty.HttpCharacterEncodingTest.MyBookService;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
@@ -27,11 +28,12 @@ public class HttpBindingPreservePostForm
     
     @Test
     public void testSendToJetty() throws Exception {
-        Exchange exchange = template.send("http://localhost:9080/myapp/myservice", new Processor() {
+        Exchange exchange = template.send("http://localhost:9080/myapp/myservice?query1=a&query2=b", new Processor() {
 
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setBody("b1=x&b2=y");
                 exchange.getIn().setHeader("content-type", "application/x-www-form-urlencoded");
+                exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
             }
                                         
         });
@@ -51,8 +53,10 @@ public class HttpBindingPreservePostForm
                         
                         // for unit testing make sure we got right message
                         assertEquals("The body message is wrong", "b1=x&b2=y", body);
-                        assertEquals("Get a wrong message header", exchange.getIn().getHeader("b1"), "x");
-                        assertEquals("Get a wrong message header", exchange.getIn().getHeader("b2"), "y");
+                        assertEquals("Get a wrong query parameter from the message header", "a", exchange.getIn().getHeader("query1"));
+                        assertEquals("Get a wrong query parameter from the message header", "b", exchange.getIn().getHeader("query2"));
+                        assertEquals("Get a wrong form parameter from the message header", "x", exchange.getIn().getHeader("b1"));
+                        assertEquals("Get a wrong form parameter from the message header", "y", exchange.getIn().getHeader("b2"));
                         
                         // send a response
                         exchange.getOut().setBody("Request message is OK");