Author: markt
Date: Wed Nov 11 20:02:31 2015
New Revision: 1713924
URL: http://svn.apache.org/viewvc?rev=1713924&view=rev
Log:
Fix remaining test case failures after adding date header to response
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1713924&r1=1713923&r2=1713924&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Wed Nov 11
20:02:31 2015
@@ -55,7 +55,7 @@ public abstract class Http2TestBase exte
// Nothing special about this date apart from it being the date I ran the
// test that demonstrated that most HTTP/2 tests were failing because the
// response now included a date header
- private static final String DEFAULT_DATE = "Wed, 11 Nov 2015 19:18:42 GMT";
+ protected static final String DEFAULT_DATE = "Wed, 11 Nov 2015 19:18:42
GMT";
static final String DEFAULT_CONNECTION_HEADER_VALUE = "Upgrade,
HTTP2-Settings";
private static final byte[] EMPTY_SETTINGS_FRAME =
@@ -888,6 +888,7 @@ public abstract class Http2TestBase exte
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
// Generate an empty response
+ resp.setContentType("application/octet-stream");
resp.setContentLength(0);
resp.flushBuffer();
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_1.java?rev=1713924&r1=1713923&r2=1713924&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_1.java Wed Nov
11 20:02:31 2015
@@ -35,13 +35,14 @@ public class TestHttp2Section_6_1 extend
sendSimplePostRequest(3, null);
readSimplePostResponse(false);
- Assert.assertEquals("0-WindowSize-[128]\n"
- + "3-WindowSize-[128]\n"
- + "3-HeadersStart\n"
- + "3-Header-[:status]-[200]\n"
- + "3-HeadersEnd\n"
- + "3-Body-128\n"
- + "3-EndOfStream\n", output.getTrace());
+ Assert.assertEquals("0-WindowSize-[128]\n" +
+ "3-WindowSize-[128]\n" +
+ "3-HeadersStart\n" +
+ "3-Header-[:status]-[200]\n" +
+ "3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+ "3-HeadersEnd\n" +
+ "3-Body-128\n" +
+ "3-EndOfStream\n", output.getTrace());
}
@@ -63,13 +64,14 @@ public class TestHttp2Section_6_1 extend
Assert.assertTrue(trace, trace.contains(paddingWindowUpdate));
trace = trace.replace(paddingWindowUpdate, "");
- Assert.assertEquals("0-WindowSize-[119]\n"
- + "3-WindowSize-[119]\n"
- + "3-HeadersStart\n"
- + "3-Header-[:status]-[200]\n"
- + "3-HeadersEnd\n"
- + "3-Body-119\n"
- + "3-EndOfStream\n", trace);
+ Assert.assertEquals("0-WindowSize-[119]\n" +
+ "3-WindowSize-[119]\n" +
+ "3-HeadersStart\n" +
+ "3-Header-[:status]-[200]\n" +
+ "3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+ "3-HeadersEnd\n" +
+ "3-Body-119\n" +
+ "3-EndOfStream\n", trace);
}
@@ -154,12 +156,13 @@ public class TestHttp2Section_6_1 extend
// Since padding is zero length, response looks like there is none.
readSimplePostResponse(false);
- Assert.assertEquals("0-WindowSize-[127]\n"
- + "3-WindowSize-[127]\n"
- + "3-HeadersStart\n"
- + "3-Header-[:status]-[200]\n"
- + "3-HeadersEnd\n"
- + "3-Body-127\n"
- + "3-EndOfStream\n", output.getTrace());
+ Assert.assertEquals("0-WindowSize-[127]\n" +
+ "3-WindowSize-[127]\n" +
+ "3-HeadersStart\n" +
+ "3-Header-[:status]-[200]\n" +
+ "3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+ "3-HeadersEnd\n" +
+ "3-Body-127\n" +
+ "3-EndOfStream\n", output.getTrace());
}
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java?rev=1713924&r1=1713923&r2=1713924&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java Wed Nov
11 20:02:31 2015
@@ -199,6 +199,7 @@ public class TestHttp2Section_6_9 extend
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+ "3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-4096\n", output.getTrace());
output.clearTrace();
@@ -235,6 +236,7 @@ public class TestHttp2Section_6_9 extend
Assert.assertEquals(
"5-HeadersStart\n" +
"5-Header-[:status]-[200]\n" +
+ "5-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
"5-HeadersEnd\n" +
"5-Body-128\n" +
"5-EndOfStream\n", output.getTrace());
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java?rev=1713924&r1=1713923&r2=1713924&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java Wed Nov
11 20:02:31 2015
@@ -55,6 +55,7 @@ public class TestHttp2Section_8_1 extend
Assert.assertEquals("3-HeadersStart\n" +
"3-Header-[:status]-[101]\n" +
+ "3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n",
output.getTrace());
output.clearTrace();
@@ -71,6 +72,7 @@ public class TestHttp2Section_8_1 extend
"3-WindowSize-[256]\n" +
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+ "3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-256\n" +
"3-EndOfStream\n",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
