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 2015/11/27 17:47:36 UTC
svn commit: r1716897 - in /sling/trunk/testing/mocks/sling-mock/src:
main/java/org/apache/sling/testing/mock/sling/servlet/
test/java/org/apache/sling/testing/mock/sling/servlet/
Author: sseifert
Date: Fri Nov 27 16:47:35 2015
New Revision: 1716897
URL: http://svn.apache.org/viewvc?rev=1716897&view=rev
Log:
SLING-5339 sling-mock: Support remote add, remote host and remote port in MockSlingHttpSevletRequest
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java?rev=1716897&r1=1716896&r2=1716897&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java Fri Nov 27 16:47:35 2015
@@ -97,6 +97,10 @@ public class MockSlingHttpServletRequest
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
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
@@ -743,21 +775,6 @@ public class MockSlingHttpServletRequest
throw new UnsupportedOperationException();
}
- @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();
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java?rev=1716897&r1=1716896&r2=1716897&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java Fri Nov 27 16:47:35 2015
@@ -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;
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java?rev=1716897&r1=1716896&r2=1716897&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java Fri Nov 27 16:47:35 2015
@@ -327,12 +327,35 @@ public class MockSlingHttpServletRequest
}
@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());
+ }
+
}