You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/09/09 09:10:59 UTC
[sling-org-apache-sling-servlet-helpers] branch master updated:
SLING-8690 Servlet Helpers: MockSlingHttpServletRequest.getContextPath
should return "" by default
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 9649aac SLING-8690 Servlet Helpers: MockSlingHttpServletRequest.getContextPath should return "" by default
9649aac is described below
commit 9649aaca8d5e729bf7b6fb09c50827ce6aae4215
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Sep 9 11:10:48 2019 +0200
SLING-8690 Servlet Helpers: MockSlingHttpServletRequest.getContextPath should return "" by default
---
.../org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java | 2 +-
.../apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index f1d92ab..ffdb997 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -87,7 +87,7 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
private HttpSession session;
private Resource resource;
private String authType;
- private String contextPath;
+ private String contextPath = "";
private String queryString;
private String scheme = "http";
private String serverName = "localhost";
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
index dcba6b4..843abd6 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
@@ -173,7 +173,7 @@ public class MockSlingHttpServletRequestTest {
@Test
public void testContextPath() {
- assertNull(request.getContextPath());
+ assertEquals("", request.getContextPath());
request.setContextPath("/ctx");
assertEquals("/ctx", request.getContextPath());
}