[tomcat] 02/03: Refactor response header handling in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2522b5a01ee6a4cabd6094745e664e72df799568
Author: Mark Thomas
AuthorDate: Mon Nov 11 11:29:03 2019 +
Refactor response header handling in unit tests
1. Use CaseInsensitiveKeyMap to store received headers
2. Use the getSingleHeader() utility method
This results in a small reduction in duplicate code.
---
test/javax/servlet/http/TestHttpServlet.java | 7 +-
.../apache/catalina/connector/TestResponse.java| 4 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 19 ++
.../catalina/filters/TestAddCharSetFilter.java | 4 +-
.../apache/catalina/filters/TestExpiresFilter.java | 16 ++---
.../apache/catalina/mapper/TestMapperWebapps.java | 16 ++---
.../servlets/DefaultServletEncodingBaseTest.java | 6 +-
.../apache/catalina/startup/TomcatBaseTest.java| 32 -
test/org/apache/coyote/TestResponse.java | 75 --
.../apache/coyote/http11/TestHttp11Processor.java | 21 +++---
test/org/apache/jasper/compiler/TestCompiler.java | 6 +-
test/org/apache/jasper/compiler/TestGenerator.java | 8 +--
test/org/apache/jasper/compiler/TestParser.java| 30 +++--
.../compiler/TestParserNoStrictWhitespace.java | 9 +--
test/org/apache/jasper/servlet/TestTldScanner.java | 3 +-
15 files changed, 152 insertions(+), 104 deletions(-)
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 331a0f6..8c03ee3 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -31,6 +31,7 @@ import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
public class TestHttpServlet extends TomcatBaseTest {
@@ -92,13 +93,13 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
-Map> resHeaders= new HashMap<>();
+Map> resHeaders= new CaseInsensitiveKeyMap<>();
String path = "http://localhost:; + getPort() + "/outer";
ByteChunk out = new ByteChunk();
int rc = getUrl(path, out, resHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-String length = resHeaders.get("Content-Length").get(0);
+String length = getSingleHeader("Content-Length", resHeaders);
Assert.assertEquals(Long.parseLong(length), out.getLength());
out.recycle();
@@ -124,7 +125,7 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
-Map> getHeaders = new HashMap<>();
+Map> getHeaders = new CaseInsensitiveKeyMap<>();
String path = "http://localhost:; + getPort() + "/chunking";
ByteChunk out = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestResponse.java
b/test/org/apache/catalina/connector/TestResponse.java
index 415b4d3..14f78f3 100644
--- a/test/org/apache/catalina/connector/TestResponse.java
+++ b/test/org/apache/catalina/connector/TestResponse.java
@@ -18,7 +18,6 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,6 +36,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterContext;
import org.apache.tomcat.unittest.TesterRequest;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
/**
* Test case for {@link Request}.
@@ -56,7 +56,7 @@ public class TestResponse extends TomcatBaseTest {
tomcat.start();
-Map> headers = new HashMap<>();
+Map> headers = new CaseInsensitiveKeyMap<>();
getUrl("http://localhost:; + getPort() + "/", new ByteChunk(),
headers);
// Check for headers without a name
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index ccf3228..d305cbd 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -21,8 +21,6 @@ import java.io.PrintWriter;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
@@ -65,6 +63,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
import org.apache.tomcat.unittest.TesterContext;
import org.apache.tomcat.util.buf.ByteChunk;
+import
[tomcat] 02/03: Refactor response header handling in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8423772b53f9677ec0ed74463abae60bbe82527e
Author: Mark Thomas
AuthorDate: Mon Nov 11 11:29:03 2019 +
Refactor response header handling in unit tests
1. Use CaseInsensitiveKeyMap to store received headers
2. Use the getSingleHeader() utility method
This results in a small reduction in duplicate code.
---
test/javax/servlet/http/TestHttpServlet.java | 7 +++--
.../apache/catalina/connector/TestResponse.java| 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 19 +
.../catalina/filters/TestAddCharSetFilter.java | 4 +--
.../apache/catalina/filters/TestExpiresFilter.java | 16 +++
.../apache/catalina/mapper/TestMapperWebapps.java | 16 +++
.../servlets/DefaultServletEncodingBaseTest.java | 6 ++--
.../apache/catalina/startup/TomcatBaseTest.java| 32 --
test/org/apache/coyote/TestResponse.java | 14 --
.../apache/coyote/http11/TestHttp11Processor.java | 21 ++
test/org/apache/jasper/compiler/TestCompiler.java | 6 ++--
test/org/apache/jasper/compiler/TestGenerator.java | 8 +-
test/org/apache/jasper/compiler/TestParser.java| 30 ++--
.../compiler/TestParserNoStrictWhitespace.java | 9 ++
test/org/apache/jasper/servlet/TestTldScanner.java | 3 +-
15 files changed, 87 insertions(+), 108 deletions(-)
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 331a0f6..8c03ee3 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -31,6 +31,7 @@ import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
public class TestHttpServlet extends TomcatBaseTest {
@@ -92,13 +93,13 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
-Map> resHeaders= new HashMap<>();
+Map> resHeaders= new CaseInsensitiveKeyMap<>();
String path = "http://localhost:; + getPort() + "/outer";
ByteChunk out = new ByteChunk();
int rc = getUrl(path, out, resHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-String length = resHeaders.get("Content-Length").get(0);
+String length = getSingleHeader("Content-Length", resHeaders);
Assert.assertEquals(Long.parseLong(length), out.getLength());
out.recycle();
@@ -124,7 +125,7 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
-Map> getHeaders = new HashMap<>();
+Map> getHeaders = new CaseInsensitiveKeyMap<>();
String path = "http://localhost:; + getPort() + "/chunking";
ByteChunk out = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestResponse.java
b/test/org/apache/catalina/connector/TestResponse.java
index 9e289b2..ee12e58 100644
--- a/test/org/apache/catalina/connector/TestResponse.java
+++ b/test/org/apache/catalina/connector/TestResponse.java
@@ -19,7 +19,6 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,6 +37,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterContext;
import org.apache.tomcat.unittest.TesterRequest;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
/**
* Test case for {@link Request}.
@@ -57,7 +57,7 @@ public class TestResponse extends TomcatBaseTest {
tomcat.start();
-Map> headers = new HashMap<>();
+Map> headers = new CaseInsensitiveKeyMap<>();
getUrl("http://localhost:; + getPort() + "/", new ByteChunk(),
headers);
// Check for headers without a name
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index f01aba5..56e86ae 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -21,8 +21,6 @@ import java.io.PrintWriter;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
@@ -65,6 +63,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
import org.apache.tomcat.unittest.TesterContext;
import
