You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/03/31 19:29:40 UTC
svn commit: r643071 - in
/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest:
./ servlets/post/
Author: cziegeler
Date: Mon Mar 31 10:29:36 2008
New Revision: 643071
URL: http://svn.apache.org/viewvc?rev=643071&view=rev
Log:
SLING-326: Rename all references from ujax to sling.
Modified:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Mon Mar 31 10:29:36 2008
@@ -32,6 +32,7 @@
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
@@ -94,7 +95,7 @@
testClient.delete(nodeUrl);
}
};
-
+
protected static String removeEndingSlash(String str) {
if(str != null && str.endsWith("/")) {
return str.substring(0, str.length() - 1);
@@ -129,7 +130,7 @@
@Override
protected void tearDown() throws Exception {
super.tearDown();
-
+
for(String url : urlsToDelete) {
testClient.delete(url);
}
@@ -138,7 +139,7 @@
/** On the server side, initialization of Sling bundles is done
* asynchronously once the webapp is started. This method checks
* that everything's ready on the server side, by calling an URL
- * that requires the UjaxPostServlet and the JCR repository to
+ * that requires the SlingPostServlet and the JCR repository to
* work correctly.
*/
protected void waitForSlingStartup() throws Exception {
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java Mon Mar 31 10:29:36 2008
@@ -32,7 +32,7 @@
public void testForcedRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", "http://forced/");
+ params.put("sling:post:redirect", "http://forced/");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
@@ -45,7 +45,7 @@
public void testDefaultRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", null);
+ params.put("sling:post:redirect", null);
final String location = testClient.createNode(postUrl, null, null,
false);
assertTrue("With no headers or parameters, redirect (" + location
@@ -55,7 +55,7 @@
public void testMagicStarRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", "*");
+ params.put("sling:post:redirect", "*");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
final String location = testClient.createNode(postUrl, params, headers,
@@ -68,7 +68,7 @@
public void testMagicStarRedirectPrefix() throws IOException {
String prefix = "xyz/";
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", prefix + "*");
+ params.put("sling:post:redirect", prefix + "*");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
final String location = testClient.createNode(postUrl, params, headers,
@@ -80,7 +80,7 @@
public void testMagicStarRedirectSuffix() throws IOException {
String suffix = "/xyz.html";
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", "*" + suffix);
+ params.put("sling:post:redirect", "*" + suffix);
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
final String location = testClient.createNode(postUrl, params, headers,
@@ -93,7 +93,7 @@
String prefix = "xyz/";
String suffix = "/xyz.html";
final Map<String, String> params = new HashMap<String, String>();
- params.put("ujax:redirect", prefix + "*" + suffix);
+ params.put("sling:post:redirect", prefix + "*" + suffix);
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
final String location = testClient.createNode(postUrl, params, headers,
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java Mon Mar 31 10:29:36 2008
@@ -22,12 +22,12 @@
import org.apache.commons.httpclient.methods.GetMethod;
/**
- * Test uploading files using the ujax post servlet (SLING-168)
+ * Test uploading files using the Sling post servlet (SLING-168)
*/
public class UploadFileTest extends HttpTestBase {
private static final String TEST_FILE = "src/test/resources/integration-test/file-to-upload.txt";
-
+
public void testDistinctResource() throws IOException {
String folderPath = "/UploadFileTest_1_" + System.currentTimeMillis();
final String url = HTTP_BASE_URL + folderPath;
@@ -118,7 +118,7 @@
// get and check URL of created file
String urlOfFileNode = url + "/file";
-
+
/*
TODO: does not work, since no nt:file resource type handler present ???
@@ -130,7 +130,7 @@
final byte[] data = get.getResponseBody();
assertEquals("size of file must be same", localFile.length(), data.length);
*/
-
+
String webdavUrl = WEBDAV_BASE_URL + folderPath + "/file";
final GetMethod get = new GetMethod(webdavUrl);
final int status = httpClient.executeMethod(get);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java Mon Mar 31 10:29:36 2008
@@ -127,7 +127,7 @@
props.put("STUFF_a","123");
props.put("STUFF_b","456");
props.put("c","not saved");
- props.put("ujax:saveParamPrefix","STUFF_");
+ props.put("sling:post:saveParamPrefix","STUFF_");
final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
@@ -141,7 +141,7 @@
props.put("++a","123");
props.put("++b","456");
props.put("c","not saved");
- props.put("ujax:saveParamPrefix","++");
+ props.put("sling:post:saveParamPrefix","++");
final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props,null,false);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java Mon Mar 31 10:29:36 2008
@@ -28,14 +28,14 @@
/** Test node deletion via the MicrojaxPostServlet */
public class PostServletDeleteTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
private String postUrl;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
-
+
assertHttpStatus(postUrl, HttpServletResponse.SC_NOT_FOUND,
"Path must not exist before test: " + postUrl);
}
@@ -45,23 +45,23 @@
final String urlB = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
final String urlC = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, null);
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");
-
+
// delete one and check
final List <NameValuePair> params = new LinkedList<NameValuePair> ();
- final String deleteCmd = "ujax:delete";
+ final String deleteCmd = "sling:post:delete";
params.add(new NameValuePair(deleteCmd,urlToNodePath(urlA)));
assertPostStatus(postUrl,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");
-
+
// delete the others with one request and check
params.clear();
params.add(new NameValuePair(deleteCmd,urlToNodePath(urlB)));
@@ -72,11 +72,11 @@
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)");
-
+
// attempting to delete non-existing nodes is ok
assertPostStatus(postUrl,HttpServletResponse.SC_OK,params,"Delete must return expected status (2)");
}
-
+
private String urlToNodePath(String url) {
return url.substring(HTTP_BASE_URL.length());
}
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java Mon Mar 31 10:29:36 2008
@@ -25,7 +25,7 @@
/** Test node move via the MicrojaxPostServlet */
public class PostServletMoveTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-move-tests";
+ public static final String TEST_BASE_PATH = "/sling-move-tests";
@Override
protected void setUp() throws Exception {
@@ -39,8 +39,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/src", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", testPath + "/dest");
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", testPath + "/dest");
testClient.createNode(HTTP_BASE_URL + testPath, props);
String content = getContent(HTTP_BASE_URL + testPath + "/dest.json", CONTENT_TYPE_JSON);
assertJavascript("Hello", content, "out.println(data.text)");
@@ -53,8 +53,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/src", props);
props.clear();
- props.put("ujax:moveSrc", "src");
- props.put("ujax:moveDest", "dest");
+ props.put("sling:post:moveSrc", "src");
+ props.put("sling:post:moveDest", "dest");
testClient.createNode(HTTP_BASE_URL + testPath, props);
String content = getContent(HTTP_BASE_URL + testPath + "/dest.json", CONTENT_TYPE_JSON);
assertJavascript("Hello", content, "out.println(data.text)");
@@ -67,8 +67,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/src", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", "new");
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", "new");
String newNode = testClient.createNode(HTTP_BASE_URL + testPath + "/*", props);
String content = getContent(newNode + "/new.json", CONTENT_TYPE_JSON);
assertJavascript("Hello", content, "out.println(data.text)");
@@ -85,8 +85,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/dest", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", testPath + "/dest");
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", testPath + "/dest");
try {
testClient.createNode(HTTP_BASE_URL + testPath, props);
} catch (IOException ioe) {
@@ -95,7 +95,7 @@
throw ioe;
}
}
-
+
// expect unmodified dest
String content = getContent(HTTP_BASE_URL + testPath + "/dest.json", CONTENT_TYPE_JSON);
assertJavascript("Hello Destination", content, "out.println(data.text)");
@@ -112,9 +112,9 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/dest", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", testPath + "/dest");
- props.put("ujax:moveFlags", "replace"); // replace dest
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", testPath + "/dest");
+ props.put("sling:post:moveFlags", "replace"); // replace dest
testClient.createNode(HTTP_BASE_URL + testPath, props);
String content = getContent(HTTP_BASE_URL + testPath + "/dest.json", CONTENT_TYPE_JSON);
assertJavascript("Hello", content, "out.println(data.text)");
@@ -127,8 +127,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/src", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", "deep/new");
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", "deep/new");
String newNode = testClient.createNode(HTTP_BASE_URL + testPath + "/*", props);
String content = getContent(newNode + "/deep/new.json", CONTENT_TYPE_JSON);
assertJavascript("Hello", content, "out.println(data.text)");
@@ -141,8 +141,8 @@
testClient.createNode(HTTP_BASE_URL + testPath + "/src", props);
props.clear();
- props.put("ujax:moveSrc", testPath + "/src");
- props.put("ujax:moveDest", "/some/not/existing/structure");
+ props.put("sling:post:moveSrc", testPath + "/src");
+ props.put("sling:post:moveDest", "/some/not/existing/structure");
try {
testClient.createNode(HTTP_BASE_URL + testPath + "/*", props);
// not quite correct. should check status response
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java Mon Mar 31 10:29:36 2008
@@ -28,7 +28,7 @@
/** Test the order option for node creation via the MicrojaxPostServlet */
public class PostServletOrderTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests-order";
+ public static final String TEST_BASE_PATH = "/sling-tests-order";
private static final String[] DEFAULT_ORDER = new String[]{"a","b","c","d"};
@@ -53,115 +53,115 @@
createNodes(postUrl, DEFAULT_ORDER);
verifyOrder(postUrl, DEFAULT_ORDER);
}
-
+
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="first" request
+ * sling:post:order="first" request
*/
public void testOrderFirst() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","first");
+ props.put("sling:post:order","first");
testClient.createNode(postUrl + "/c", props);
verifyOrder(postUrl, new String[]{"c", "a", "b", "d"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="last" request
+ * sling:post:order="last" request
*/
public void testOrderLast() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","last");
+ props.put("sling:post:order","last");
testClient.createNode(postUrl + "/c", props);
verifyOrder(postUrl, new String[]{"a", "b", "d", "c"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="before" request
+ * sling:post:order="before" request
*/
public void testOrderBefore() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","before b");
+ props.put("sling:post:order","before b");
testClient.createNode(postUrl + "/c", props);
verifyOrder(postUrl, new String[]{"a", "c", "b", "d"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="after" request
+ * sling:post:order="after" request
*/
public void testOrderAfter() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","after c");
+ props.put("sling:post:order","after c");
testClient.createNode(postUrl + "/b", props);
verifyOrder(postUrl, new String[]{"a", "c", "b", "d"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="N" request, where new position is greater than old one.
+ * sling:post:order="N" request, where new position is greater than old one.
*/
public void testOrderIntToBack() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","2");
+ props.put("sling:post:order","2");
testClient.createNode(postUrl + "/a", props);
verifyOrder(postUrl, new String[]{"b", "c", "a", "d"});
}
-
+
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="N" request, where new position is less than old one.
+ * sling:post:order="N" request, where new position is less than old one.
*/
public void testOrderIntToFront() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","1");
+ props.put("sling:post:order","1");
testClient.createNode(postUrl + "/d", props);
verifyOrder(postUrl, new String[]{"a", "d", "b", "c"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="0" request
+ * sling:post:order="0" request
*/
public void testOrderIntZero() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","0");
+ props.put("sling:post:order","0");
testClient.createNode(postUrl + "/d", props);
verifyOrder(postUrl, new String[]{"d", "a", "b", "c"});
}
/**
* Create nodes and check if they are in correct order after a
- * ujax:order="N" request, where new position is out of bounds
+ * sling:post:order="N" request, where new position is out of bounds
*/
public void testOrderIntOOB() throws IOException {
final String postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
createNodes(postUrl, DEFAULT_ORDER);
final Map <String, String> props = new HashMap <String, String> ();
- props.put("ujax:order","100");
+ props.put("sling:post:order","100");
testClient.createNode(postUrl + "/a", props);
verifyOrder(postUrl, new String[]{"b", "c", "d", "a"});
}
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java Mon Mar 31 10:29:36 2008
@@ -27,15 +27,15 @@
/** Test node updates via the MicrojaxPostServlet */
public class PostServletUpdateTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
private String postUrl;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
}
-
+
public void testPostPathIsUnique() throws IOException {
assertHttpStatus(postUrl, HttpServletResponse.SC_NOT_FOUND,
"Path must not exist before test: " + postUrl);
@@ -45,11 +45,11 @@
final Map <String, String> props = new HashMap <String, String> ();
props.put("./a","123");
props.put("./b","456");
-
+
final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
-
+
props.put("./a","789");
// the testClient method is called createNode but all it does is a POST,
// so it can be used for updates as well
@@ -58,16 +58,16 @@
content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("789456", content, "out.println(data.a + data.b)");
}
-
+
public void testUpdateNoChanges() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
props.put("./a","123");
props.put("./b","456");
-
+
final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
-
+
props.clear();
// the testClient method is called createNode but all it does is a POST,
// so it can be used for updates as well
@@ -76,21 +76,21 @@
content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
}
-
+
public void testUpdateSomeChanges() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
props.put("./a","123");
props.put("./b","456");
props.put("C","not stored");
-
+
final String location = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123456", content, "out.println(data.a + data.b)");
-
+
props.clear();
props.put("./b","457");
props.put("C","still not stored");
-
+
// the testClient method is called createNode but all it does is a POST,
// so it can be used for updates as well
final String newLocation = testClient.createNode(location, props);
@@ -98,5 +98,5 @@
content = getContent(location + ".json", CONTENT_TYPE_JSON);
assertJavascript("123457", content, "out.println(data.a + data.b)");
}
-
+
}
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java Mon Mar 31 10:29:36 2008
@@ -27,19 +27,19 @@
/** {#link MicrojaxPropertyValueSetter} sets the value of some properties
* automatically if they are empty. This is tested here with various cases.
- */
+ */
public class SlingAutoPropertiesTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
private String postUrl;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
}
-
+
public void testPostPathIsUnique() throws IOException {
assertHttpStatus(postUrl, HttpServletResponse.SC_NOT_FOUND,
"Path must not exist before test: " + postUrl);
@@ -48,15 +48,15 @@
public void testCreatedAndModified() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
props.put("a","123");
-
+
props.put("created","");
props.put("createdBy","");
props.put("lastModified","");
props.put("lastModifiedBy","");
-
+
final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
-
+
assertJavascript("123", content, "out.println(data.a)");
assertJavascript("admin", content, "out.println(data.createdBy)");
assertJavascript("admin", content, "out.println(data.lastModifiedBy)");
@@ -70,10 +70,10 @@
} catch(InterruptedException ignored) {
// ignore
}
-
+
testClient.createNode(createdNodeUrl, props);
content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
-
+
assertJavascript("123", content, "out.println(data.a)");
assertJavascript("admin", content, "out.println(data.createdBy)");
assertJavascript("admin", content, "out.println(data.lastModifiedBy)");
@@ -81,19 +81,19 @@
assertJavascript("true", content, "out.println(data.lastModified.length > 0)");
assertJavascript("true", content, "out.println(data.lastModified > data.created)");
}
-
+
public void testWithSpecificValues() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
props.put("a","123");
-
+
props.put("created","a");
props.put("createdBy","b");
props.put("lastModified","c");
props.put("lastModifiedBy","d");
-
+
final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
-
+
assertJavascript("123", content, "out.println(data.a)");
assertJavascript("a", content, "out.println(data.created)");
assertJavascript("b", content, "out.println(data.createdBy)");
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java Mon Mar 31 10:29:36 2008
@@ -32,7 +32,7 @@
public class SlingDateValuesTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
// TODO: the commented formats do not work beacuse of SLING-242
// the + of the timezone offset is stripped by sling
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java Mon Mar 31 10:29:36 2008
@@ -23,13 +23,13 @@
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
import org.apache.sling.servlets.post.impl.SlingPostServlet;
-/** {#link UjaxPropertyValueSetter} sets the value of some properties
+/** {#link SlingPropertyValueSetter} sets the value of some properties
* with default values if they are empty. This is tested here with various cases.
*/
public class SlingDefaultValuesTest extends HttpTestBase {
- public static final String TEST_BASE_PATH = "/ujax-tests";
+ public static final String TEST_BASE_PATH = "/sling-tests";
private String postUrl;
@Override
@@ -77,7 +77,7 @@
public void testWithIgnore() throws IOException {
final Map <String, String> props = new HashMap <String, String> ();
props.put("a","");
- props.put("a@DefaultValue","ujax:ignore");
+ props.put("a@DefaultValue","sling:post:ignore");
final String createdNodeUrl = testClient.createNode(postUrl + SlingPostServlet.DEFAULT_CREATE_SUFFIX, props);
final String content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
@@ -96,7 +96,7 @@
// now try to delete prop by sending empty string
props.put("a","");
- props.put("a@DefaultValue","ujax:null");
+ props.put("a@DefaultValue","sling:post:null");
testClient.createNode(createdNodeUrl, props);
content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON);
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java?rev=643071&r1=643070&r2=643071&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java Mon Mar 31 10:29:36 2008
@@ -22,20 +22,20 @@
import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase;
-/** Test the ujax:sessionInfo resource */
+/** Test the sling:sessionInfo resource */
public class SlingSessionInfoTest extends HttpTestBase {
-
+
public void testSessionInfo() throws IOException {
- final String content = getContent(HTTP_BASE_URL + "/ujax.sessionInfo.json", CONTENT_TYPE_JSON);
-
+ final String content = getContent(HTTP_BASE_URL + "/sling.sessionInfo.json", CONTENT_TYPE_JSON);
+
// assume workspace name contains "default", might not
// always be the case as the default workspace is selected
// by the JCR implementation due to SLING-256
assertJavascript("admin.true", content, "out.println(data.userID + '.' + (data.workspace.indexOf('default') >= 0) )");
}
-
- public void testNonexistentUjaxUrl() throws IOException {
- assertHttpStatus(HTTP_BASE_URL + "/ujax.nothing", HttpServletResponse.SC_NOT_FOUND);
+
+ public void testNonexistentSlingUrl() throws IOException {
+ assertHttpStatus(HTTP_BASE_URL + "/sling.nothing", HttpServletResponse.SC_NOT_FOUND);
}
}