[sling-org-apache-sling-testing-sling-mock] 07/14: SLING-5339 sling-mock: Support remote add, remote host and remote port in MockSlingHttpSevletRequest

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-1.6.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit dd7948a891e953ad03775b8eddeda5f54fd67c78
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Nov 27 16:47:35 2015 +0000

    SLING-5339 sling-mock: Support remote add, remote host and remote port in MockSlingHttpSevletRequest
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1716897 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/servlet/MockSlingHttpServletRequest.java | 47 +++++++++++++++-------
 .../testing/mock/sling/servlet/package-info.java   |  2 +-
 .../servlet/MockSlingHttpServletRequestTest.java   | 29 +++++++++++--
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
index 667edeb..4aa59e0 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
@@ -97,6 +97,10 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
     private String characterEncoding;
     private byte[] content;
     private String remoteUser;
+    private String remoteAddr;
+    private String remoteHost;
+    private int remotePort;
+
     private MockRequestDispatcherFactory requestDispatcherFactory;
     
     private static final ResourceBundle EMPTY_RESOURCE_BUNDLE = new ListResourceBundle() {
@@ -626,6 +630,34 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
         this.remoteUser = remoteUser;
     }
 
+    @Override
+    public String getRemoteAddr() {
+        return remoteAddr;
+    }
+
+    public void setRemoteAddr(String remoteAddr) {
+        this.remoteAddr = remoteAddr;
+    }
+
+    @Override
+    public String getRemoteHost() {
+        return remoteHost;
+    }
+
+    public void setRemoteHost(String remoteHost) {
+        this.remoteHost = remoteHost;
+    }
+
+    @Override
+    public int getRemotePort() {
+        return remotePort;
+    }
+
+    public void setRemotePort(int remotePort) {
+        this.remotePort = remotePort;
+    }
+
+    
     // --- unsupported operations ---
 
     @Override
@@ -744,21 +776,6 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling
     }
 
     @Override
-    public String getRemoteAddr() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getRemoteHost() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getRemotePort() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
     public boolean authenticate(HttpServletResponse response) {
         throw new UnsupportedOperationException();
     }
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
index cfc5f97..356283f 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Mock implementation of selected Servlet-related Sling APIs.
  */
-@aQute.bnd.annotation.Version("1.3")
+@aQute.bnd.annotation.Version("1.4")
 package org.apache.sling.testing.mock.sling.servlet;
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
index 953f52d..1fb14c9 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
@@ -327,12 +327,35 @@ public class MockSlingHttpServletRequestTest {
     }
     
     @Test
-    public void testGetRemoteUserN() {
-        
+    public void testGetRemoteUser() {
         assertNull(null, request.getRemoteUser());
         
         request.setRemoteUser("admin");
         assertEquals("admin", request.getRemoteUser());
     }
-    
+
+    @Test
+    public void testGetRemoteAddr() throws Exception {
+        assertNull(null, request.getRemoteAddr());
+        
+        request.setRemoteAddr("1.2.3.4");
+        assertEquals("1.2.3.4", request.getRemoteAddr());
+    }
+
+    @Test
+    public void testGetRemoteHost() throws Exception {
+        assertNull(null, request.getRemoteHost());
+        
+        request.setRemoteHost("host1");
+        assertEquals("host1", request.getRemoteHost());
+    }
+
+    @Test
+    public void testGetRemotePort() throws Exception {
+        assertEquals(0, request.getRemotePort());
+        
+        request.setRemotePort(1234);
+        assertEquals(1234, request.getRemotePort());
+    }
+
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.