This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
The following commit(s) were added to refs/heads/master by this push: new 60969dd SLING-7482 MockSlingHttpServletResponse.getHeaders is case sensitive 60969dd is described below commit 60969dd4588cc63f7c8583cba72b26b69a64d8ae Author: sseifert <sseif...@pro-vision.de> AuthorDate: Wed Feb 14 17:06:28 2018 +0100 SLING-7482 MockSlingHttpServletResponse.getHeaders is case sensitive --- src/main/java/org/apache/sling/servlethelpers/HeaderSupport.java | 4 ++-- .../sling/servlethelpers/MockSlingHttpServletRequestTest.java | 6 +++--- .../sling/servlethelpers/MockSlingHttpServletResponseTest.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/servlethelpers/HeaderSupport.java b/src/main/java/org/apache/sling/servlethelpers/HeaderSupport.java index 48a5f39..1c12e89 100644 --- a/src/main/java/org/apache/sling/servlethelpers/HeaderSupport.java +++ b/src/main/java/org/apache/sling/servlethelpers/HeaderSupport.java @@ -100,7 +100,7 @@ class HeaderSupport { private void removeHeaders(String name) { for (int i = this.headers.size() - 1; i >= 0; i--) { - if (StringUtils.equals(this.headers.get(i).getKey(), name)) { + if (StringUtils.equalsIgnoreCase(this.headers.get(i).getKey(), name)) { headers.remove(i); } } @@ -140,7 +140,7 @@ class HeaderSupport { public Collection<String> getHeaders(String name) { List<String> values = new ArrayList<String>(); for (HeaderValue entry : headers) { - if (StringUtils.equals(entry.getKey(), name)) { + if (StringUtils.equalsIgnoreCase(entry.getKey(), name)) { values.add(entry.getValue()); } } diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java index aa7e275..9c02ec7 100644 --- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java +++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java @@ -252,12 +252,12 @@ public class MockSlingHttpServletRequestTest { request.addIntHeader("header2", 5); request.addDateHeader("header3", dateValue); - assertEquals("value1", request.getHeader("header1")); - assertEquals(5, request.getIntHeader("header2")); + assertEquals("value1", request.getHeader("Header1")); + assertEquals(5, request.getIntHeader("headeR2")); assertEquals(dateValue, request.getDateHeader("header3")); request.setHeader("header1", "value2"); - request.addIntHeader("header2", 10); + request.addIntHeader("Header2", 10); Enumeration<String> header1Values = request.getHeaders("header1"); assertEquals("value2", header1Values.nextElement()); diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java index abbfa6a..fbef731 100644 --- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java +++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java @@ -80,8 +80,8 @@ public class MockSlingHttpServletResponseTest { response.addDateHeader("header3", System.currentTimeMillis()); assertEquals(3, response.getHeaderNames().size()); - assertTrue(response.containsHeader("header1")); - assertEquals("value1", response.getHeader("header1")); + assertTrue(response.containsHeader("Header1")); + assertEquals("value1", response.getHeader("headeR1")); assertEquals("5", response.getHeader("header2")); assertNotNull(response.getHeader("header3")); @@ -90,7 +90,7 @@ public class MockSlingHttpServletResponseTest { assertEquals(3, response.getHeaderNames().size()); - Collection<String> header1Values = response.getHeaders("header1"); + Collection<String> header1Values = response.getHeaders("Header1"); assertEquals(1, header1Values.size()); assertEquals("value2", header1Values.iterator().next()); -- To stop receiving notification emails like this one, please contact sseif...@apache.org.