You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2015/04/28 11:35:12 UTC
svn commit: r1676456 - in
/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest:
PostRedirectTest.java servlets/post/PostServletImportTest.java
Author: kwin
Date: Tue Apr 28 09:35:12 2015
New Revision: 1676456
URL: http://svn.apache.org/r1676456
Log:
SLING-4666 fix ITs of SlingPostServlet which does no longer allow redirects with host information
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java?rev=1676456&r1=1676455&r2=1676456&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java Tue Apr 28 09:35:12 2015
@@ -46,15 +46,16 @@ public class PostRedirectTest extends Ht
public void testForcedRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
- params.put(":redirect", "http://forced");
+ params.put(":redirect", "/forced");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
final String location = testClient.createNode(postUrl, params, headers,
false);
+ // the servlet container prepends the host information to the redirect location
assertEquals(
"With forced redirect and Referer, redirect must be forced",
- "http://forced", location);
+ HTTP_BASE_URL + "/forced", location);
}
public void testDefaultRedirect() throws IOException {
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java?rev=1676456&r1=1676455&r2=1676456&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java Tue Apr 28 09:35:12 2015
@@ -208,14 +208,12 @@ public class PostServletImportTest exten
props.put(SlingPostConstants.RP_CONTENT, jsonContent2);
props.put(SlingPostConstants.RP_CONTENT_TYPE, "json");
- props.put(SlingPostConstants.RP_REDIRECT_TO, importedNodeUrl);
props.put(SlingPostConstants.RP_REPLACE, "false");
props.put(SlingPostConstants.RP_REPLACE_PROPERTIES, "true");
- String importedNodeUrl2 = testClient.createNode(importedNodeUrl, props);
- assertEquals(importedNodeUrl, importedNodeUrl2);
+ testClient.createNode(importedNodeUrl, props);
// assert content at new location
- String content2 = getContent(importedNodeUrl2 + ".3.json", CONTENT_TYPE_JSON);
+ String content2 = getContent(importedNodeUrl + ".3.json", CONTENT_TYPE_JSON);
JSONObject jsonObj2 = new JSONObject(content2);
assertNotNull(jsonObj2);