svn commit: r1702987 - /tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

[markt]

Author: markt
Date: Mon Sep 14 16:13:58 2015
New Revision: 1702987

URL: http://svn.apache.org/r1702987
Log:
Fix tests now that Tomcat no longer provides a reason phrase in the response 
line. For AJP it provides the status code as a String since some mod_jk / httpd 
2.2.x combinations can't handle a missing reason phrase.

Modified:
    tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1702987&r1=1702986&r2=1702987&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Mon 
Sep 14 16:13:58 2015
@@ -310,7 +310,7 @@ public class TestAbstractAjpProcessor ex
         }
 
         // Expect 3 packets: headers, body, end
-        validateResponseHeaders(responseHeaders, 200, "OK");
+        validateResponseHeaders(responseHeaders, 200, "200");
 
         String body = extractResponseBody(ajpClient.readMessage());
         RequestDescriptor result = SnoopResult.parse(body);
@@ -511,7 +511,7 @@ public class TestAbstractAjpProcessor ex
 
         TesterAjpMessage responseHeaders = 
ajpClient.sendMessage(forwardMessage);
         // Expect 3 packets: headers, body, end
-        validateResponseHeaders(responseHeaders, 403, "Forbidden");
+        validateResponseHeaders(responseHeaders, 403, "403");
         //TesterAjpMessage responseBody = ajpClient.readMessage();
         //validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
         validateResponseEnd(ajpClient.readMessage(), false);
@@ -525,7 +525,7 @@ public class TestAbstractAjpProcessor ex
 
         responseHeaders = ajpClient.sendMessage(forwardMessage);
         // Expect 3 packets: headers, body, end
-        validateResponseHeaders(responseHeaders, 403, "Forbidden");
+        validateResponseHeaders(responseHeaders, 403, "403");
         //responseBody = ajpClient.readMessage();
         //validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
         validateResponseEnd(ajpClient.readMessage(), false);
@@ -539,7 +539,7 @@ public class TestAbstractAjpProcessor ex
 
         responseHeaders = ajpClient.sendMessage(forwardMessage);
         // Expect 3 packets: headers, body, end
-        validateResponseHeaders(responseHeaders, 200, "OK");
+        validateResponseHeaders(responseHeaders, 200, "200");
         TesterAjpMessage responseBody = ajpClient.readMessage();
         validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
         validateResponseEnd(ajpClient.readMessage(), true);
@@ -576,7 +576,7 @@ public class TestAbstractAjpProcessor ex
         for (int i = 0; i < 2; i++) {
             TesterAjpMessage responseHeaders = 
ajpClient.sendMessage(forwardMessage);
             // Expect 3 packets: headers, body, end
-            validateResponseHeaders(responseHeaders, 200, "OK");
+            validateResponseHeaders(responseHeaders, 200, "200");
             TesterAjpMessage responseBody = ajpClient.readMessage();
             validateResponseBody(responseBody, 
HelloWorldServlet.RESPONSE_TEXT);
             validateResponseEnd(ajpClient.readMessage(), true);
@@ -593,14 +593,14 @@ public class TestAbstractAjpProcessor ex
 
     @Test
     public void testPost() throws Exception {
-        doTestPost(false, HttpServletResponse.SC_OK, "OK");
+        doTestPost(false, HttpServletResponse.SC_OK, "200");
     }
 
 
     @Test
     public void testPostMultipleContentLength() throws Exception {
         // Multiple content lengths
-        doTestPost(true, HttpServletResponse.SC_BAD_REQUEST, "Bad Request");
+        doTestPost(true, HttpServletResponse.SC_BAD_REQUEST, "400");
     }
 
 
@@ -679,7 +679,7 @@ public class TestAbstractAjpProcessor ex
                 ajpClient.sendMessage(forwardMessage, null);
 
         // Expect 2 messages: headers, end
-        validateResponseHeaders(responseHeaders, 304, "Not Modified");
+        validateResponseHeaders(responseHeaders, 304, "304");
         validateResponseEnd(ajpClient.readMessage(), true);
 
         // Double check the connection is still open
@@ -738,7 +738,7 @@ public class TestAbstractAjpProcessor ex
                 ajpClient.sendMessage(forwardMessage, null);
 
         // Expect 3 messages: headers, body, end
-        validateResponseHeaders(responseHeaders, 200, "OK");
+        validateResponseHeaders(responseHeaders, 200, "200");
         validateResponseBody(ajpClient.readMessage(),
                 "Request Body length in bytes: 0");
         validateResponseEnd(ajpClient.readMessage(), true);
@@ -793,7 +793,7 @@ public class TestAbstractAjpProcessor ex
         TesterAjpMessage responseHeaders = 
ajpClient.sendMessage(forwardMessage);
 
         // Expect 3 messages: headers, body, end for a valid request
-        validateResponseHeaders(responseHeaders, 200, "OK");
+        validateResponseHeaders(responseHeaders, 200, "200");
         TesterAjpMessage responseBody = ajpClient.readMessage();
         Assert.assertTrue(responseBody.len > 15000);
         validateResponseEnd(ajpClient.readMessage(), true);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org