Author: markt
Date: Thu Jun 11 12:25:12 2015
New Revision: 1684864
URL: http://svn.apache.org/r1684864
Log:
Simplify
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_1.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_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=1684864&r1=1684863&r2=1684864&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Thu Jun 11
12:25:12 2015
@@ -263,6 +263,7 @@ public abstract class Http2TestBase exte
input = new TestInput(is);
output = new TestOutput();
parser = new Http2Parser("-1", input, output);
+ hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_1.java?rev=1684864&r1=1684863&r2=1684864&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_1.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_1.java Thu Jun
11 12:25:12 2015
@@ -38,8 +38,6 @@ public class TestHttp2Section_4_1 extend
@Test
public void testUnknownFrameType() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
http2Connect();
os.write(UNKNOWN_FRAME);
os.flush();
@@ -54,8 +52,6 @@ public class TestHttp2Section_4_1 extend
@Test
public void testReservedBitIgnored() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1684864&r1=1684863&r2=1684864&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Thu Jun
11 12:25:12 2015
@@ -30,8 +30,6 @@ public class TestHttp2Section_4_2 extend
@Test
public void testFrameSizeLimitsTooBig() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -67,8 +65,6 @@ public class TestHttp2Section_4_2 extend
@Test
public void testFrameTypeLimitsTooBig() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -97,8 +93,6 @@ public class TestHttp2Section_4_2 extend
@Test
public void testFrameTypeLimitsTooSmall() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -126,8 +120,6 @@ public class TestHttp2Section_4_2 extend
@Test
public void testFrameTypeLimitsStream() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java?rev=1684864&r1=1684863&r2=1684864&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java Thu Jun
11 12:25:12 2015
@@ -32,8 +32,6 @@ public class TestHttp2Section_4_3 extend
@Test
public void testHeaderDecodingError() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -59,8 +57,6 @@ public class TestHttp2Section_4_3 extend
@Test
public void testHeaderContinuationContiguous() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -85,8 +81,6 @@ public class TestHttp2Section_4_3 extend
@Test
public void testHeaderContinuationNonContiguous() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java?rev=1684864&r1=1684863&r2=1684864&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java Thu Jun
11 12:25:12 2015
@@ -64,7 +64,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void halfClosedRemoteInvalidFrame() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
http2Connect();
// This half-closes the stream since it includes the end of stream flag
@@ -85,8 +84,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void testClosedInvalidFrame01() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -133,8 +130,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void testClientSendEvenStream() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// HTTP2 upgrade
http2Connect();
@@ -155,8 +150,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void testClientSendOldStream() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
http2Connect();
sendSimpleRequest(5);
readSimpleResponse();
@@ -183,7 +176,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void testImplicitClose() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
http2Connect();
sendPriority(3, 0, 16);
@@ -208,8 +200,6 @@ public class TestHttp2Section_5_1 extend
@Test
public void testExceedMaxActiveStreams() throws Exception {
- hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
-
// http2Connect() - modified
enableHttp2(1);
configureAndStartWebApplication();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
