svn commit: r1798814 - in /sling/trunk/bundles/extensions/servlet-helpers/src: main/java/org/apache/sling/servlethelpers/ test/java/org/apache/sling/servlethelpers/

[sseifert]

Author: sseifert
Date: Thu Jun 15 09:50:41 2017
New Revision: 1798814

URL: http://svn.apache.org/viewvc?rev=1798814&view=rev
Log:
SLING-6947 add setPathInfo method to allow setting a custom pathinfo

Modified:
    
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
    
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/package-info.java
    
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java

Modified: 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java?rev=1798814&r1=1798813&r2=1798814&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
 (original)
+++ 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
 Thu Jun 15 09:50:41 2017
@@ -89,6 +89,7 @@ public class MockSlingHttpServletRequest
     private String serverName = "localhost";
     private int serverPort = 80;
     private String servletPath = StringUtils.EMPTY;
+    private String pathInfo = null;
     private String method = HttpConstants.METHOD_GET;
     private final HeaderSupport headerSupport = new HeaderSupport();
     private final CookieSupport cookieSupport = new CookieSupport();
@@ -658,6 +659,10 @@ public class MockSlingHttpServletRequest
 
     @Override
     public String getPathInfo() {
+        if (this.pathInfo != null) {
+            return this.pathInfo; 
+        }
+        
         RequestPathInfo requestPathInfo = this.getRequestPathInfo();
 
         if (StringUtils.isEmpty(requestPathInfo.getResourcePath())) {
@@ -684,6 +689,10 @@ public class MockSlingHttpServletRequest
 
         return pathInfo.toString();
     }
+    
+    public void setPathInfo(String pathInfo) {
+        this.pathInfo = pathInfo;
+    }
 
     @Override
     public String getRequestURI() {

Modified: 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/package-info.java?rev=1798814&r1=1798813&r2=1798814&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/package-info.java
 (original)
+++ 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/package-info.java
 Thu Jun 15 09:50:41 2017
@@ -19,5 +19,5 @@
 /**
  * Mock implementation of selected Servlet-related Sling APIs.
  */
-@org.osgi.annotation.versioning.Version("1.1")
+@org.osgi.annotation.versioning.Version("1.2")
 package org.apache.sling.servlethelpers;

Modified: 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java?rev=1798814&r1=1798813&r2=1798814&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
 Thu Jun 15 09:50:41 2017
@@ -387,4 +387,21 @@ public class MockSlingHttpServletRequest
         assertEquals(1234, request.getRemotePort());
     }
 
+    @Test
+    public void testServletPathWithPathInfo() throws Exception {
+        request.setServletPath("/my/path");
+        request.setPathInfo("/myinfo");;
+
+        assertEquals("/my/path", request.getServletPath());
+        assertEquals("/myinfo", request.getPathInfo());
+    }
+
+    @Test
+    public void testServletPathWithOutPathInfo() throws Exception {
+        request.setServletPath("/my/path");
+
+        assertEquals("/my/path", request.getServletPath());
+        assertNull(request.getPathInfo());
+    }
+
 }