You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/03/18 14:38:43 UTC

svn commit: r1457761 - /camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java

Author: davsclaus
Date: Mon Mar 18 13:38:43 2013
New Revision: 1457761

URL: http://svn.apache.org/r1457761
Log:
CAMEL-5913: Polished test

Modified:
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java?rev=1457761&r1=1457760&r2=1457761&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java Mon Mar 18 13:38:43 2013
@@ -32,6 +32,7 @@ public class JettyHttpGetWithParamAsExch
     @Test
     public void testHttpGetWithParamsViaURI() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("one", "einz");
         mock.expectedHeaderReceived("two", "twei");
         mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
@@ -44,6 +45,7 @@ public class JettyHttpGetWithParamAsExch
     @Test
     public void testHttpGetWithUTF8EncodedParamsViaURI() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("message", "Keine g\u00FCltige GPS-Daten!");
         mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
 
@@ -56,17 +58,45 @@ public class JettyHttpGetWithParamAsExch
     @Ignore
     public void testHttpGetWithISO8859EncodedParamsViaURI() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("message", "Keine g\u00C6ltige GPS-Daten!");
         mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
-        
+
         template.requestBody(serverUri + "?message=Keine+g%C6ltige+GPS-Daten%21", null, Object.class);
 
         assertMockEndpointsSatisfied();
     }
 
     @Test
+    public void testHttpGetWithSpaceInParams() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.expectedHeaderReceived("message", " World");
+        mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
+
+        // parameter starts with a space using %2B as decimal encoded
+        template.requestBody(serverUri + "?message=%2BWorld", null, Object.class);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Test
+    public void testHttpGetWithSpaceAsPlusInParams() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.expectedHeaderReceived("message", " World");
+        mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
+
+        // parameter starts with a space using + decoded
+        template.requestBody(serverUri + "?message=+World", null, Object.class);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Test
     public void testHttpGetWithParamsViaHeader() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("one", "uno");
         mock.expectedHeaderReceived("two", "dos");
         mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
@@ -79,6 +109,7 @@ public class JettyHttpGetWithParamAsExch
     @Test
     public void testHttpPost() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello World");
         mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST");