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/01/29 12:13:28 UTC
[sling-org-apache-sling-servlets-resolver] 04/04: SLING-8110 - our
test servlet is a teapot, indeed
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-servlets-resolver.git
commit b16b79a746906ac7c542dac7bb8246be185a4137
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jan 29 13:13:03 2020 +0100
SLING-8110 - our test servlet is a teapot, indeed
---
.../sling/servlets/resolver/it/ServletResolverTestSupport.java | 2 +-
.../java/org/apache/sling/servlets/resolver/it/TestServlet.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index 6c30337..36c009f 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -180,7 +180,7 @@ public class ServletResolverTestSupport extends TestSupport {
}
protected void assertTestServlet(final String method, final String path, final String servletName) throws Exception {
- final String output = executeRequest(method, path, 200).getOutputAsString();
+ final String output = executeRequest(method, path, TestServlet.IM_A_TEAPOT).getOutputAsString();
final String expected = TestServlet.SERVED_BY_PREFIX + servletName;
assertTrue("Expecting output to contain " + expected + ", got " + output, output.contains(expected));
}
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/TestServlet.java b/src/test/java/org/apache/sling/servlets/resolver/it/TestServlet.java
index c6f7776..39e1d08 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/TestServlet.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/TestServlet.java
@@ -37,13 +37,18 @@ public class TestServlet extends HttpServlet {
public static final String SERVED_BY_PREFIX = "SERVED_BY_";
+ // Use a specific HTTP status to identify this servlet.
+ // I've waited all my career to find a good use for status 418, and
+ // interestingly it's not part of the HttpServletResponse constants.
+ public static final int IM_A_TEAPOT = 418;
+
public TestServlet(String name) {
this.name = name;
}
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- resp.getWriter().write(SERVED_BY_PREFIX + name);
+ resp.sendError(IM_A_TEAPOT, SERVED_BY_PREFIX + name);
}
@Override