SLING-770 - fix tests due to change in default rendering semantics
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk@726016 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
index cfff60b..e2f024e 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
@@ -43,7 +43,7 @@
}
// get and check URL of created node
- final GetMethod get = new GetMethod(urlOfNewNode);
+ final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
final String responseBodyStr = get.getResponseBodyAsString();
@@ -51,15 +51,15 @@
assertTrue(responseBodyStr.contains("value2"));
// test default txt and html renderings
- getContent(urlOfNewNode, CONTENT_TYPE_PLAIN);
+ getContent(urlOfNewNode + DEFAULT_EXT, CONTENT_TYPE_PLAIN);
getContent(urlOfNewNode + ".txt", CONTENT_TYPE_PLAIN);
getContent(urlOfNewNode + ".html", CONTENT_TYPE_HTML);
getContent(urlOfNewNode + ".json", CONTENT_TYPE_JSON);
getContent(urlOfNewNode + ".xml", CONTENT_TYPE_XML);
// And extensions for which we have no renderer fail
- assertHttpStatus(urlOfNewNode + ".pdf", 500);
- assertHttpStatus(urlOfNewNode + ".someWeirdExtension", 500);
+ assertHttpStatus(urlOfNewNode + ".pdf", 403);
+ assertHttpStatus(urlOfNewNode + ".someWeirdExtension", 403);
}
public void testCreateNodeMultipart() throws IOException {
@@ -79,7 +79,7 @@
}
// check node contents (not all renderings - those are tested above)
- final GetMethod get = new GetMethod(urlOfNewNode);
+ final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
final String responseBodyStr = get.getResponseBodyAsString();
@@ -163,7 +163,7 @@
}
// get and check URL of created node
- final GetMethod get = new GetMethod(urlOfNewNode);
+ final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
}
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
index 8b1a592..38ef6af 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
@@ -35,7 +35,7 @@
fail(ioe.getMessage());
}
- assertHttpStatus(testDirUrl, 200, testDirUrl);
+ assertHttpStatus(testDirUrl + DEFAULT_EXT, 200, testDirUrl);
try {
testClient.mkdir(testDirUrl);
@@ -43,7 +43,7 @@
fail("mkdir must succeed on an existing directory, got IOException:" + ioe);
}
- assertHttpStatus(testDirUrl, 200, testDirUrl);
+ assertHttpStatus(testDirUrl + DEFAULT_EXT, 200, testDirUrl);
testClient.delete(testDirUrl);
assertHttpStatus(testDirUrl, 404, testDirUrl + " must be gone after DELETE");
@@ -59,6 +59,6 @@
} catch(IOException ioe) {
fail("mkdirs failed:" + ioe);
}
- assertHttpStatus(url,200,url + " must exist after test");
+ assertHttpStatus(url + DEFAULT_EXT,200,url + " must exist after test");
}
}
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
index c26e40a..b6ed3aa 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
@@ -43,7 +43,7 @@
public void testCreateNode() throws IOException {
final String location = testClient.createNode(postUrl + SlingPostConstants.DEFAULT_CREATE_SUFFIX, null);
- assertHttpStatus(location, HttpServletResponse.SC_OK,
+ assertHttpStatus(location + DEFAULT_EXT, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must have generated name",
!location.endsWith("/*"));
@@ -53,7 +53,7 @@
public void testCreateNodeWithExtension() throws IOException {
final String location = testClient.createNode(postUrl + SlingPostConstants.DEFAULT_CREATE_SUFFIX + ".html", null);
- assertHttpStatus(location, HttpServletResponse.SC_OK,
+ assertHttpStatus(location + DEFAULT_EXT, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must have generated name",
!location.endsWith("/*"));
@@ -64,7 +64,7 @@
public void testCreateNodeAtSpecificUrl() throws IOException {
final String specifiedLocation = postUrl + "/specified-location";
final String location = testClient.createNode(specifiedLocation, null);
- assertHttpStatus(location, HttpServletResponse.SC_OK,
+ assertHttpStatus(location + DEFAULT_EXT, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must be created at given URL (" + specifiedLocation + ")",
location.equals(specifiedLocation));
@@ -74,7 +74,7 @@
final long id = System.currentTimeMillis();
final String specifiedLocation = postUrl + "/specified-location" + id + "/deepA/deepB/" + id;
final String location = testClient.createNode(specifiedLocation, null);
- assertHttpStatus(location, HttpServletResponse.SC_OK,
+ assertHttpStatus(location + DEFAULT_EXT, HttpServletResponse.SC_OK,
"POST must redirect to created resource (" + location + ")");
assertTrue("Node (" + location + ") must be created (deep) at given URL (" + specifiedLocation + ")",
location.equals(specifiedLocation));
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
index 13197ad..b627886 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
@@ -47,28 +47,28 @@
final String urlD = testClient.createNode(postUrl + "/specific-location/for-delete", null);
// initially all nodes must be found
- assertHttpStatus(urlA, HttpServletResponse.SC_OK, "A must initially exist");
- assertHttpStatus(urlB, HttpServletResponse.SC_OK, "B must initially exist");
- assertHttpStatus(urlC, HttpServletResponse.SC_OK, "C must initially exist");
- assertHttpStatus(urlD, HttpServletResponse.SC_OK, "D must initially exist");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_OK, "A must initially exist");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_OK, "B must initially exist");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_OK, "C must initially exist");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_OK, "D must initially exist");
// delete one and check
final List <NameValuePair> params = new LinkedList<NameValuePair> ();
params.add(new NameValuePair(SlingPostConstants.RP_OPERATION, SlingPostConstants.OPERATION_DELETE));
assertPostStatus(urlA,HttpServletResponse.SC_OK,params,"Delete must return expected status (3)");
- assertHttpStatus(urlA, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (1)");
- assertHttpStatus(urlB, HttpServletResponse.SC_OK, "B must still exist");
- assertHttpStatus(urlC, HttpServletResponse.SC_OK, "C must still exist");
- assertHttpStatus(urlD, HttpServletResponse.SC_OK, "D must still exist");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (1)");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_OK, "B must still exist");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_OK, "C must still exist");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_OK, "D must still exist");
// delete the others with successive requests
assertPostStatus(urlB,HttpServletResponse.SC_OK,params,"Delete must return expected status (2)");
assertPostStatus(urlC,HttpServletResponse.SC_OK,params,"Delete must return expected status (2)");
assertPostStatus(urlD,HttpServletResponse.SC_OK,params,"Delete must return expected status (2)");
- assertHttpStatus(urlA, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (2)");
- assertHttpStatus(urlB, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (2)");
- assertHttpStatus(urlC, HttpServletResponse.SC_NOT_FOUND, "C must be deleted (2)");
- assertHttpStatus(urlD, HttpServletResponse.SC_NOT_FOUND, "D must be deleted (2)");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (2)");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (2)");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "C must be deleted (2)");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "D must be deleted (2)");
// attempting to delete non-existing nodes is ok
assertPostStatus(postUrl,HttpServletResponse.SC_OK,params,"Delete must return expected status (2)");
@@ -81,10 +81,10 @@
final String urlD = testClient.createNode(postUrl + "/specific-location/for-delete", null);
// initially all nodes must be found
- assertHttpStatus(urlA, HttpServletResponse.SC_OK, "A must initially exist");
- assertHttpStatus(urlB, HttpServletResponse.SC_OK, "B must initially exist");
- assertHttpStatus(urlC, HttpServletResponse.SC_OK, "C must initially exist");
- assertHttpStatus(urlD, HttpServletResponse.SC_OK, "D must initially exist");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_OK, "A must initially exist");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_OK, "B must initially exist");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_OK, "C must initially exist");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_OK, "D must initially exist");
// delete one and check
final List <NameValuePair> params = new LinkedList<NameValuePair> ();
@@ -92,10 +92,10 @@
params.add(new NameValuePair(SlingPostConstants.RP_APPLY_TO, urlA.substring(HTTP_BASE_URL.length())));
params.add(new NameValuePair(SlingPostConstants.RP_APPLY_TO, urlB.substring(HTTP_BASE_URL.length())));
assertPostStatus(urlC,HttpServletResponse.SC_OK,params,"Delete must return expected status (3)");
- assertHttpStatus(urlA, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (1)");
- assertHttpStatus(urlB, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (1)");
- assertHttpStatus(urlC, HttpServletResponse.SC_OK, "C must still exist");
- assertHttpStatus(urlD, HttpServletResponse.SC_OK, "D must still exist");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (1)");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (1)");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_OK, "C must still exist");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_OK, "D must still exist");
// delete the others with successive requests
params.clear();
@@ -105,9 +105,9 @@
params.add(new NameValuePair(SlingPostConstants.RP_APPLY_TO, urlC.substring(HTTP_BASE_URL.length())));
params.add(new NameValuePair(SlingPostConstants.RP_APPLY_TO, urlD.substring(HTTP_BASE_URL.length())));
assertPostStatus(urlC,HttpServletResponse.SC_OK,params,"Delete must return expected status (3)");
- assertHttpStatus(urlA, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (2)");
- assertHttpStatus(urlB, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (2)");
- assertHttpStatus(urlC, HttpServletResponse.SC_NOT_FOUND, "C must be deleted (2)");
- assertHttpStatus(urlD, HttpServletResponse.SC_NOT_FOUND, "D must be deleted (2)");
+ assertHttpStatus(urlA + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "A must be deleted (2)");
+ assertHttpStatus(urlB + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "B must be deleted (2)");
+ assertHttpStatus(urlC + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "C must be deleted (2)");
+ assertHttpStatus(urlD + DEFAULT_EXT, HttpServletResponse.SC_NOT_FOUND, "D must be deleted (2)");
}
}
\ No newline at end of file
