Author: markt
Date: Sat Mar 25 08:24:38 2017
New Revision: 1788647
URL: http://svn.apache.org/viewvc?rev=1788647&view=rev
Log:
Fix tests broken after addition of further validation on the server
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.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=1788647&r1=1788646&r2=1788647&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Sat Mar 25
08:24:38 2017
@@ -177,6 +177,7 @@ public abstract class Http2TestBase exte
int streamId, String url) {
List<Header> headers = new ArrayList<>(3);
headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":scheme", "http"));
headers.add(new Header(":path", url));
headers.add(new Header(":authority", "localhost:" + getPort()));
@@ -215,6 +216,7 @@ public abstract class Http2TestBase exte
int streamId) {
List<Header> headers = new ArrayList<>(3);
headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":scheme", "http"));
headers.add(new Header(":path", "/simple"));
buildSimpleGetRequestPart1(frameHeader, headersPayload, headers,
streamId);
@@ -306,6 +308,7 @@ public abstract class Http2TestBase exte
byte[] trailersFrameHeader, ByteBuffer trailersPayload, int
streamId) {
MimeHeaders headers = new MimeHeaders();
headers.addValue(":method").setString("POST");
+ headers.addValue(":scheme").setString("http");
headers.addValue(":path").setString("/simple");
headers.addValue(":authority").setString("localhost:" + getPort());
if (useExpectation) {
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java?rev=1788647&r1=1788646&r2=1788647&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java Sat Mar 25
08:24:38 2017
@@ -41,15 +41,15 @@ public class TestHttp2Limits extends Htt
@Test
public void testHeaderLimits100x32() throws Exception {
// Just within default maxHeaderCount
- // Note request has 3 standard headers
- doTestHeaderLimits(97, 32, 0);
+ // Note request has 4 standard headers
+ doTestHeaderLimits(96, 32, 0);
}
@Test
public void testHeaderLimits101x32() throws Exception {
// Just above default maxHeaderCount
- doTestHeaderLimits(98, 32, 1);
+ doTestHeaderLimits(97, 32, 1);
}
@@ -61,17 +61,17 @@ public class TestHttp2Limits extends Htt
@Test
- public void testHeaderLimits8x1001() throws Exception {
+ public void testHeaderLimits8x1144() throws Exception {
// Just within default maxHttpHeaderSize
- // per header overhead plus standard 2 headers
- doTestHeaderLimits(8, 1001, 0);
+ // per header overhead plus standard 3 headers
+ doTestHeaderLimits(7, 1144, 0);
}
@Test
- public void testHeaderLimits8x1002() throws Exception {
+ public void testHeaderLimits8x1145() throws Exception {
// Just above default maxHttpHeaderSize
- doTestHeaderLimits(8, 1002, 1);
+ doTestHeaderLimits(7, 1145, 1);
}
@@ -263,6 +263,7 @@ public class TestHttp2Limits extends Htt
String path) throws Exception {
MimeHeaders headers = new MimeHeaders();
headers.addValue(":method").setString("GET");
+ headers.addValue(":scheme").setString("http");
headers.addValue(":path").setString(path);
headers.addValue(":authority").setString("localhost:" + getPort());
for (String[] customHeader : customHeaders) {
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=1788647&r1=1788646&r2=1788647&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 Sat Mar
25 08:24:38 2017
@@ -141,8 +141,9 @@ public class TestHttp2Section_8_1 extend
@Test
public void testUndefinedPseudoHeader() throws Exception {
- List<Header> headers = new ArrayList<>(3);
+ List<Header> headers = new ArrayList<>(5);
headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":scheme", "http"));
headers.add(new Header(":path", "/simple"));
headers.add(new Header(":authority", "localhost:" + getPort()));
headers.add(new Header(":foo", "bar"));
@@ -153,8 +154,9 @@ public class TestHttp2Section_8_1 extend
@Test
public void testInvalidPseudoHeader() throws Exception {
- List<Header> headers = new ArrayList<>(3);
+ List<Header> headers = new ArrayList<>(5);
headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":scheme", "http"));
headers.add(new Header(":path", "/simple"));
headers.add(new Header(":authority", "localhost:" + getPort()));
headers.add(new Header(":status", "200"));
@@ -170,8 +172,9 @@ public class TestHttp2Section_8_1 extend
http2Connect();
- List<Header> headers = new ArrayList<>(3);
+ List<Header> headers = new ArrayList<>(4);
headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":scheme", "http"));
headers.add(new Header(":path", "/simple"));
headers.add(new Header("x-test", "test"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
