You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2020/06/11 10:01:02 UTC
[sling-org-apache-sling-servlet-helpers] 02/02: SLING-9512 -
improve test coverage
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
commit f4153b13ae0bbe2fa6f1f5910e4b00ab7ae0e630
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Jun 11 12:00:33 2020 +0200
SLING-9512 - improve test coverage
---
.../internalrequests/InternalRequest.java | 18 +++++++-----------
.../internalrequests/MockServletResolver.java | 6 +++++-
.../internalrequests/MockSlingRequestProcessor.java | 9 +++++++--
.../internalrequests/RequestInfoServlet.java | 7 ++++++-
.../internalrequests/ServletInternalRequestTest.java | 15 ++++++++++++++-
5 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/sling/servlethelpers/internalrequests/InternalRequest.java b/src/main/java/org/apache/sling/servlethelpers/internalrequests/InternalRequest.java
index 94c9c6a..1c0f026 100644
--- a/src/main/java/org/apache/sling/servlethelpers/internalrequests/InternalRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/internalrequests/InternalRequest.java
@@ -24,9 +24,9 @@ import java.io.Reader;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import java.util.OptionalInt;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
@@ -245,16 +245,12 @@ public abstract class InternalRequest {
return this;
}
- boolean ok = false;
- final int actualStatus = response.getStatus();
- for(int expected : acceptableValues) {
- if(actualStatus == expected) {
- ok = true;
- break;
- }
- }
- if(!ok) {
- throw new IOException("Unexpected response status " + actualStatus + " expected one of " + Arrays.asList(acceptableValues));
+ final int actualStatus = getStatus();
+ final OptionalInt found = Arrays.stream(acceptableValues).filter(expected -> expected == actualStatus).findFirst();
+ if(!found.isPresent()) {
+ final StringBuilder sb = new StringBuilder();
+ Arrays.stream(acceptableValues).forEach(val -> sb.append(sb.length() == 0 ? "" : ",").append(val));
+ throw new IOException("Unexpected response status " + actualStatus + ", expected one of '" + sb + "'");
}
return this;
}
diff --git a/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockServletResolver.java b/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockServletResolver.java
index 17c7f55..711ee1f 100644
--- a/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockServletResolver.java
+++ b/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockServletResolver.java
@@ -29,7 +29,11 @@ class MockServletResolver implements ServletResolver {
@Override
public Servlet resolveServlet(SlingHttpServletRequest request) {
- return new RequestInfoServlet(request);
+ if(request.getResource() != null && "NOSERVLET".equals(request.getResource().getResourceType())) {
+ return null;
+ } else {
+ return new RequestInfoServlet(request);
+ }
}
@Override
diff --git a/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockSlingRequestProcessor.java b/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockSlingRequestProcessor.java
index 20c2b26..ec49d97 100644
--- a/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockSlingRequestProcessor.java
+++ b/src/test/java/org/apache/sling/servlethelpers/internalrequests/MockSlingRequestProcessor.java
@@ -31,8 +31,13 @@ import org.apache.sling.engine.SlingRequestProcessor;
class MockSlingRequestProcessor implements SlingRequestProcessor {
@Override
- public void processRequest(HttpServletRequest request, HttpServletResponse response, ResourceResolver resourceResolver)
+ public void processRequest(HttpServletRequest httpRequest, HttpServletResponse response, ResourceResolver resourceResolver)
throws ServletException, IOException {
- new RequestInfoServlet((SlingHttpServletRequest)request).service(request, response);
+ final SlingHttpServletRequest request = (SlingHttpServletRequest)httpRequest;
+ if(request.getResource() != null && "NOSERVLET".equals(request.getResource().getResourceType())) {
+ response.sendError(404);
+ } else {
+ new RequestInfoServlet((SlingHttpServletRequest)request).service(request, response);
+ }
}
}
diff --git a/src/test/java/org/apache/sling/servlethelpers/internalrequests/RequestInfoServlet.java b/src/test/java/org/apache/sling/servlethelpers/internalrequests/RequestInfoServlet.java
index 239af36..10828fa 100644
--- a/src/test/java/org/apache/sling/servlethelpers/internalrequests/RequestInfoServlet.java
+++ b/src/test/java/org/apache/sling/servlethelpers/internalrequests/RequestInfoServlet.java
@@ -24,6 +24,8 @@ import java.util.Arrays;
import java.util.SortedMap;
import java.util.TreeMap;
+import javax.servlet.ServletException;
+
import org.apache.commons.io.IOUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -56,10 +58,13 @@ class RequestInfoServlet extends SlingAllMethodsServlet {
}
@Override
- public void service(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
+ public void service(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException,ServletException {
if(request.getMethod().equals("EXCEPTION")) {
throw new IOException("Failing as designed");
}
+ if(request.getMethod().equals("SERVLET-EXCEPTION")) {
+ throw new ServletException("Failing as designed");
+ }
if(request.getMethod().equals("STATUS")) {
response.setContentType("farenheit");
response.sendError(451);
diff --git a/src/test/java/org/apache/sling/servlethelpers/internalrequests/ServletInternalRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/internalrequests/ServletInternalRequestTest.java
index 9ac61f3..cb36d4f 100644
--- a/src/test/java/org/apache/sling/servlethelpers/internalrequests/ServletInternalRequestTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/internalrequests/ServletInternalRequestTest.java
@@ -27,6 +27,8 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.sling.api.resource.ResourceResolver;
import org.junit.Before;
import org.junit.Test;
@@ -126,10 +128,15 @@ public class ServletInternalRequestTest {
}
@Test(expected = IOException.class)
- public void servletException() throws IOException {
+ public void servletIOException() throws IOException {
request("/never").withRequestMethod("EXCEPTION").execute();
}
+ @Test(expected = IOException.class)
+ public void servletServletException() throws IOException {
+ request("/never").withRequestMethod("SERVLET-EXCEPTION").execute();
+ }
+
@Test
public void non200Status() throws IOException {
final InternalRequest req = request("/never").withRequestMethod("STATUS").execute();
@@ -216,4 +223,10 @@ public class ServletInternalRequestTest {
public void forgotToExecute() throws IOException {
request("/response").getResponseAsString();
}
+
+ @Test
+ public void noServletReturns404() throws IOException {
+ request("/noservlet").withResourceType("NOSERVLET").execute().checkStatus(HttpServletResponse.SC_NOT_FOUND);
+ }
+
}
\ No newline at end of file