You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/02/19 15:59:27 UTC
svn commit: r1447745 - in /sling/trunk/launchpad:
integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp
test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java
Author: cziegeler
Date: Tue Feb 19 14:59:27 2013
New Revision: 1447745
URL: http://svn.apache.org/r1447745
Log:
SLING-2544 : Restore tests included in the no longer existing JcrResourceResolverTest
Added:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java (with props)
Modified:
sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp
Modified: sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp?rev=1447745&r1=1447744&r2=1447745&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp (original)
+++ sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-api.jsp Tue Feb 19 14:59:27 2013
@@ -16,269 +16,13 @@
* limitations under the License.
*/
%><%@page import="org.junit.Assert,
+ org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest,
org.apache.sling.api.resource.ResourceUtil,
org.apache.sling.api.resource.Resource,
org.apache.sling.api.resource.ResourceResolver"%><%
%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
-%><sling:defineObjects/><%!
- private static final class ResourceResolverTestRequest implements
- HttpServletRequest {
+%><sling:defineObjects/><%
- private final String pathInfo;
-
- private final String method;
-
- private final String scheme;
-
- private final String host;
-
- private final int port;
-
- private final java.util.Map<String, Object> attrs = new java.util.HashMap<String, Object>();
-
- private String contextPath;
-
- ResourceResolverTestRequest(String pathInfo) {
- this(pathInfo, null);
- }
-
- ResourceResolverTestRequest(String pathInfo, String httpMethod) {
- this(null, null, -1, pathInfo, httpMethod);
- }
-
- ResourceResolverTestRequest(String scheme, String host, int port,
- String pathInfo) {
- this(scheme, host, port, pathInfo, null);
- }
-
- ResourceResolverTestRequest(String scheme, String host, int port,
- String pathInfo, String httpMethod) {
- this.scheme = (scheme == null) ? "http" : scheme;
- this.host = (host == null) ? "localhost" : host;
- this.port = port;
- this.pathInfo = pathInfo;
- this.method = httpMethod;
- }
-
- void setContextPath(String contextPath) {
- this.contextPath = contextPath;
- }
-
- public String getPathInfo() {
- return pathInfo;
- }
-
- public Object getAttribute(String name) {
- return attrs.get(name);
- }
-
- public java.util.Enumeration<?> getAttributeNames() {
- return null;
- }
-
- public String getCharacterEncoding() {
- return null;
- }
-
- public int getContentLength() {
- return 0;
- }
-
- public String getContentType() {
- return null;
- }
-
- public ServletInputStream getInputStream() {
- return null;
- }
-
- public String getLocalAddr() {
- return null;
- }
-
- public String getLocalName() {
- return null;
- }
-
- public int getLocalPort() {
- return 0;
- }
-
- public java.util.Locale getLocale() {
- return null;
- }
-
- public java.util.Enumeration<?> getLocales() {
- return null;
- }
-
- public String getParameter(String name) {
- return null;
- }
-
- public java.util.Map<?, ?> getParameterMap() {
- return null;
- }
-
- public java.util.Enumeration<?> getParameterNames() {
- return null;
- }
-
- public String[] getParameterValues(String name) {
- return null;
- }
-
- public String getProtocol() {
- return null;
- }
-
- public java.io.BufferedReader getReader() {
- return null;
- }
-
- public String getRealPath(String path) {
- return null;
- }
-
- public String getRemoteAddr() {
- return null;
- }
-
- public String getRemoteHost() {
- return null;
- }
-
- public int getRemotePort() {
- return 0;
- }
-
- public RequestDispatcher getRequestDispatcher(String path) {
- return null;
- }
-
- public String getScheme() {
- return scheme;
- }
-
- public String getServerName() {
- return host;
- }
-
- public int getServerPort() {
- return port;
- }
-
- public boolean isSecure() {
- return false;
- }
-
- public String getContextPath() {
- return contextPath;
- }
-
- public void removeAttribute(String name) {
- }
-
- public void setAttribute(String name, Object o) {
- attrs.put(name, o);
- }
-
- public void setCharacterEncoding(String env) {
- }
-
- public String getAuthType() {
- return null;
- }
-
- public Cookie[] getCookies() {
- return null;
- }
-
- public long getDateHeader(String name) {
- return 0;
- }
-
- public String getHeader(String name) {
- return null;
- }
-
- public java.util.Enumeration<?> getHeaderNames() {
- return null;
- }
-
- public java.util.Enumeration<?> getHeaders(String name) {
- return null;
- }
-
- public int getIntHeader(String name) {
- return 0;
- }
-
- public String getMethod() {
- return method;
- }
-
- public String getPathTranslated() {
- return null;
- }
-
- public String getQueryString() {
- return null;
- }
-
- public String getRemoteUser() {
- return null;
- }
-
- public String getRequestURI() {
- return null;
- }
-
- public StringBuffer getRequestURL() {
- return null;
- }
-
- public String getRequestedSessionId() {
- return null;
- }
-
- public String getServletPath() {
- return null;
- }
-
- public HttpSession getSession() {
- return null;
- }
-
- public HttpSession getSession(boolean create) {
- return null;
- }
-
- public java.security.Principal getUserPrincipal() {
- return null;
- }
-
- public boolean isRequestedSessionIdFromCookie() {
- return false;
- }
-
- public boolean isRequestedSessionIdFromURL() {
- return false;
- }
-
- public boolean isRequestedSessionIdFromUrl() {
- return false;
- }
-
- public boolean isRequestedSessionIdValid() {
- return false;
- }
-
- public boolean isUserInRole(String role) {
- return false;
- }
- }
-%><%
final ResourceResolver resResolver = slingRequest.getResourceResolver();
// null resource is accessing /, which exists of course
@@ -318,7 +62,7 @@
Assert.assertEquals("Path must be the original path", no_resource_path,
res0.getPath());
- final HttpServletRequest req1 = new ResourceResolverTestRequest(
+ final HttpServletRequest req1 = new FakeSlingHttpServletRequest(
no_resource_path);
final Resource res1 = resResolver.resolve(req1);
Assert.assertNotNull("Expecting resource if resolution fails", res1);
@@ -327,7 +71,7 @@
Assert.assertEquals("Path must be the original path", no_resource_path,
res1.getPath());
- final HttpServletRequest req2 = new ResourceResolverTestRequest(null);
+ final HttpServletRequest req2 = new FakeSlingHttpServletRequest(null);
final Resource res2 = resResolver.resolve(req2);
Assert.assertNotNull("Expecting resource if resolution fails", res2);
Assert.assertFalse("Resource must not be NonExistingResource was ",
Added: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java?rev=1447745&view=auto
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java (added)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java Tue Feb 19 14:59:27 2013
@@ -0,0 +1,287 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.launchpad.testservices.exported;
+
+import java.io.BufferedReader;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+public class FakeSlingHttpServletRequest implements HttpServletRequest {
+
+ private final String pathInfo;
+
+ private final String method;
+
+ private final String scheme;
+
+ private final String host;
+
+ private final int port;
+
+ private final Map<String, Object> attrs = new HashMap<String, Object>();
+
+ private String contextPath;
+
+ public FakeSlingHttpServletRequest(String pathInfo) {
+ this(pathInfo, null);
+ }
+
+ public FakeSlingHttpServletRequest(String pathInfo, String httpMethod) {
+ this(null, null, -1, pathInfo, httpMethod);
+ }
+
+ public FakeSlingHttpServletRequest(String scheme, String host, int port,
+ String pathInfo) {
+ this(scheme, host, port, pathInfo, null);
+ }
+
+ public FakeSlingHttpServletRequest(String scheme, String host, int port,
+ String pathInfo, String httpMethod) {
+ this.scheme = (scheme == null) ? "http" : scheme;
+ this.host = (host == null) ? "localhost" : host;
+ this.port = port;
+ this.pathInfo = pathInfo;
+ this.method = httpMethod;
+ }
+
+ public void setContextPath(String contextPath) {
+ this.contextPath = contextPath;
+ }
+
+ public String getPathInfo() {
+ return pathInfo;
+ }
+
+ public Object getAttribute(String name) {
+ return attrs.get(name);
+ }
+
+ public Enumeration<?> getAttributeNames() {
+ return null;
+ }
+
+ public String getCharacterEncoding() {
+ return null;
+ }
+
+ public int getContentLength() {
+ return 0;
+ }
+
+ public String getContentType() {
+ return null;
+ }
+
+ public ServletInputStream getInputStream() {
+ return null;
+ }
+
+ public String getLocalAddr() {
+ return null;
+ }
+
+ public String getLocalName() {
+ return null;
+ }
+
+ public int getLocalPort() {
+ return 0;
+ }
+
+ public Locale getLocale() {
+ return null;
+ }
+
+ public Enumeration<?> getLocales() {
+ return null;
+ }
+
+ public String getParameter(String name) {
+ return null;
+ }
+
+ public Map<?, ?> getParameterMap() {
+ return null;
+ }
+
+ public Enumeration<?> getParameterNames() {
+ return null;
+ }
+
+ public String[] getParameterValues(String name) {
+ return null;
+ }
+
+ public String getProtocol() {
+ return null;
+ }
+
+ public BufferedReader getReader() {
+ return null;
+ }
+
+ public String getRealPath(String path) {
+ return null;
+ }
+
+ public String getRemoteAddr() {
+ return null;
+ }
+
+ public String getRemoteHost() {
+ return null;
+ }
+
+ public int getRemotePort() {
+ return 0;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path) {
+ return null;
+ }
+
+ public String getScheme() {
+ return scheme;
+ }
+
+ public String getServerName() {
+ return host;
+ }
+
+ public int getServerPort() {
+ return port;
+ }
+
+ public boolean isSecure() {
+ return false;
+ }
+
+ public String getContextPath() {
+ return contextPath;
+ }
+
+ public void removeAttribute(String name) {
+ }
+
+ public void setAttribute(String name, Object o) {
+ attrs.put(name, o);
+ }
+
+ public void setCharacterEncoding(String env) {
+ }
+
+ public String getAuthType() {
+ return null;
+ }
+
+ public Cookie[] getCookies() {
+ return null;
+ }
+
+ public long getDateHeader(String name) {
+ return 0;
+ }
+
+ public String getHeader(String name) {
+ return null;
+ }
+
+ public Enumeration<?> getHeaderNames() {
+ return null;
+ }
+
+ public Enumeration<?> getHeaders(String name) {
+ return null;
+ }
+
+ public int getIntHeader(String name) {
+ return 0;
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ public String getPathTranslated() {
+ return null;
+ }
+
+ public String getQueryString() {
+ return null;
+ }
+
+ public String getRemoteUser() {
+ return null;
+ }
+
+ public String getRequestURI() {
+ return null;
+ }
+
+ public StringBuffer getRequestURL() {
+ return null;
+ }
+
+ public String getRequestedSessionId() {
+ return null;
+ }
+
+ public String getServletPath() {
+ return null;
+ }
+
+ public HttpSession getSession() {
+ return null;
+ }
+
+ public HttpSession getSession(boolean create) {
+ return null;
+ }
+
+ public Principal getUserPrincipal() {
+ return null;
+ }
+
+ public boolean isRequestedSessionIdFromCookie() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromURL() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromUrl() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdValid() {
+ return false;
+ }
+
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+}
Propchange: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/FakeSlingHttpServletRequest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain