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/28 12:40:05 UTC
[sling-org-apache-sling-servlets-resolver] 02/02: SLING-8936 -
clearer syntax
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 17ebdade79d9673d5656bfcfb361f5ed4615dd26
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jan 28 13:39:50 2020 +0100
SLING-8936 - clearer syntax
---
.../sling/servlets/resolver/it/ServletResolverTestSupport.java | 10 +++++++---
.../apache/sling/servlets/resolver/it/ServletSelectionIT.java | 4 ++--
2 files changed, 9 insertions(+), 5 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 25f9b5c..bca6901 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
@@ -166,9 +166,13 @@ 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 expected = TestServlet.SERVED_BY_PREFIX + servletName;
- assertTrue("Expecting output to contain " + expected + ", got " + output, output.contains(expected));
+ if(servletName == null) {
+ executeRequest(method, path, 404);
+ } else {
+ final String output = executeRequest(method, path, 200).getOutputAsString();
+ final String expected = TestServlet.SERVED_BY_PREFIX + servletName;
+ assertTrue("Expecting output to contain " + expected + ", got " + output, output.contains(expected));
+ }
}
// move below helpers for deep removal to Pax Exam
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletSelectionIT.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletSelectionIT.java
index 201f5b4..3b7d730 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletSelectionIT.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletSelectionIT.java
@@ -95,7 +95,7 @@ public class ServletSelectionIT extends ServletResolverTestSupport {
@Test
public void testFooPathServletWithPathSuffix() throws Exception {
- executeRequest("/foo/path/suffix", 404);
+ assertTestServlet("/foo/path/suffix", null);
assertTestServlet("/foo.someExtensions/path/suffix", "FooPathServlet");
assertTestServlet("/foo.someSelector.someExtension/path/suffix", "FooPathServlet");
}
@@ -112,7 +112,7 @@ public class ServletSelectionIT extends ServletResolverTestSupport {
@Test
public void testNoServletForExtension() throws Exception {
- executeRequest("/.yapas", 404);
+ assertTestServlet("/.yapas", null);
}
@Test