Use unique status code for each servlet and method, to avoid any ambiguity in tests
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java
index 34fd242..baf7e28 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServlet.java
@@ -43,11 +43,11 @@
@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(556);
}
@Override
protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(557);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java
index 0f32e1c..91d5b23 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/PathBoundServletWithPrefix.java
@@ -40,6 +40,6 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(610);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java
index 412ff1f..f6774b5 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServlet.java
@@ -38,11 +38,11 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(560);
}
@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(561);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java
index 181f262..2efc6fe 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithExtension.java
@@ -38,11 +38,11 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(570);
}
@Override
protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(571);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java
index 6a37056..7cb5d5e 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithMethods.java
@@ -38,16 +38,16 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(580);
}
@Override
protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(581);
}
@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(582);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java
index 454b61b..fe57258 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithPrefix.java
@@ -40,11 +40,11 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(590);
}
@Override
protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(591);
}
}
diff --git a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java
index 7a3b02a..74d3051 100644
--- a/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java
+++ b/src/main/java/org/apache/sling/servlets/annotations/testservlets/ResourceTypeBoundServletWithSelectors.java
@@ -38,11 +38,11 @@
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(600);
}
@Override
protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
- response.setStatus(555);
+ response.setStatus(601);
}
}
diff --git a/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java b/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java
index 215970c..b681add 100644
--- a/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java
+++ b/src/test/java/org/apache/sling/servlets/annotations/ServletRegistrationIT.java
@@ -84,7 +84,7 @@
CLIENT.doGet("/bin/PathBoundServlet.with.some.selector.and.extension", 555);
CLIENT.doGet("/bin/PathBoundServlet.with.some.selector.and.extension/suffix", 555);
// other methods should work as well
- CLIENT.doPut("/bin/PathBoundServlet", new StringEntity("some text"), Collections.emptyList(), 555);
+ CLIENT.doPut("/bin/PathBoundServlet", new StringEntity("some text"), Collections.emptyList(), 557);
}
@Test
@@ -95,24 +95,24 @@
@Test
public void testPathBoundServletWithPrefix() throws ClientException {
- CLIENT.doGet("/bin/PathBoundServletWithPrefix", 555);
- CLIENT.doGet("/bin/PathBoundServletWithPrefix.with.some.selector.and.extension", 555);
+ CLIENT.doGet("/bin/PathBoundServletWithPrefix", 610);
+ CLIENT.doGet("/bin/PathBoundServletWithPrefix.with.some.selector.and.extension", 610);
}
@Test
public void testResourceTypeBoundServlet() throws ClientException, UnsupportedEncodingException {
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.html", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.json", 555);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet", 560);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.html", 560);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServlet.json", 560);
// only GET and HEAD are supposed to be working
CLIENT.doPut("/content/servlettest/resourceTypeBoundServlet.json", new StringEntity("some text"), Collections.emptyList(), 201);
}
@Test
public void testResourceTypeBoundServletWithPrefix() throws ClientException, UnsupportedEncodingException {
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.html", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.json", 555);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix", 590);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.html", 590);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithPrefix.json", 590);
// only GET and HEAD are supposed to be working
CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithPrefix.json", new StringEntity("some text"), Collections.emptyList(), 201);
}
@@ -121,9 +121,9 @@
public void testResourceTypeBoundServletWithExtension() throws ClientException, UnsupportedEncodingException {
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension", 403); // without extension is a index listing, which is forbidden by default
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.html", 200); // DEFAULT GET Servlet
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext1", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", 555);
- CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", new StringEntity("some text"), Collections.emptyList(), 555);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext1", 570);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", 570);
+ CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithExtension.ext2", new StringEntity("some text"), Collections.emptyList(), 571);
// extension is considered for all methods!
CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithExtension.someotherext", new StringEntity("some text"), Collections.emptyList(), 201); // DEFAULT servlet
}
@@ -132,12 +132,12 @@
public void testResourceTypeBoundServletWithSelectors() throws ClientException, UnsupportedEncodingException {
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.someext", 404);
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.someext", 404);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector3.someext", 555);
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someext", 555);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector3.someext", 600);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someext", 600);
// some non-registered selector as first selector
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.someotherselector.selector1.selector2.someext", 404);
// some non-registered selector as last selector
- CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someotherselector.someext", 555);
+ CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithSelectors.selector1.selector2.someotherselector.someext", 600);
// only GET and HEAD are supposed to be working
CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithSelectors.selector3.someext", new StringEntity("some text"), Collections.emptyList(), 201);
}
@@ -145,7 +145,7 @@
@Test
public void testResourceTypeBoundServletWithMethods() throws ClientException, UnsupportedEncodingException {
CLIENT.doGet("/content/servlettest/resourceTypeBoundServletWithMethods.someext", 404); // DEFAULT Get not triggered due to weird extension
- CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 555);
- CLIENT.doPost("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 555);
+ CLIENT.doPut("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 581);
+ CLIENT.doPost("/content/servlettest/resourceTypeBoundServletWithMethods.someext", new StringEntity("some text"), Collections.emptyList(), 582);
}
}
