[camel] branch master updated: CAMEL-14029 tests confirming 204 code change works in Servlet component (#3275)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ed8ccc  CAMEL-14029 tests confirming 204 code change works in Servlet component (#3275)
6ed8ccc is described below

commit 6ed8ccccc3092621bea94eab5981aff35c5e4c73
Author: Mike Barlotta <Co...@users.noreply.github.com>
AuthorDate: Tue Oct 22 16:59:05 2019 -0400

    CAMEL-14029 tests confirming 204 code change works in Servlet component (#3275)
---
 .../servlet/ServletSwitchingStatusCode204Test.java | 86 ++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
new file mode 100644
index 0000000..c6c64a8
--- /dev/null
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.servlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletUnitClient;
+
+public class ServletSwitchingStatusCode204Test extends ServletCamelRouterTestSupport {
+
+
+    @Test
+    public void testSwitchingNoBodyTo204() throws Exception {
+    	 WebRequest req = new GetMethodWebRequest(CONTEXT_URL + "/services/bar");
+         ServletUnitClient client = newClient();
+         WebResponse response = client.getResponse(req);
+         
+         assertEquals(204, response.getResponseCode());
+         assertEquals("", response.getText());
+    }
+
+   @Test
+   public void testNoSwitchingNoCode() throws Exception {
+       WebRequest req = new GetMethodWebRequest(CONTEXT_URL + "/services/foo");
+       ServletUnitClient client = newClient();
+       WebResponse response = client.getResponse(req);
+
+       assertEquals(200, response.getResponseCode());
+       assertEquals("No Content", response.getText());
+   }
+	
+    @Test
+    public void testNoSwitchingNoBody() throws Exception {
+        WebRequest req = new GetMethodWebRequest(CONTEXT_URL + "/services/foobar");
+        ServletUnitClient client = newClient();
+        WebResponse response = client.getResponse(req);
+
+        assertEquals(200, response.getResponseCode());
+        assertEquals("", response.getText());
+    }
+    
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("servlet:/bar")
+                    .setBody().constant("");
+
+                from("servlet:/foo")
+                    .setBody().constant("No Content");
+
+                from("servlet:/foobar")
+                    .setHeader(Exchange.HTTP_RESPONSE_CODE, constant(200))
+                    .setBody().constant("");
+
+            }
+        };
+    }
+
+}