You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/03/28 13:03:57 UTC
svn commit: r1789125 - in /sling/trunk/launchpad:
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/
integration-tests/src/...
Author: pauls
Date: Tue Mar 28 13:03:57 2017
New Revision: 1789125
URL: http://svn.apache.org/viewvc?rev=1789125&view=rev
Log:
SLING-6713: Make the integration tests work again with the new johnzon setup
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport_utf8.json
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimportzip.json
sling/trunk/launchpad/testing/src/main/provisioning/model.txt
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java Tue Mar 28 13:03:57 2017
@@ -103,7 +103,7 @@ public class CreateNodeTest extends Http
}
String content = getContent(urlOfNewNode + ".json", CONTENT_TYPE_JSON);
- assertJavascript("nt:folder", content, "out.println(data['jcr:primaryType'])");
+ assertJavascript("nt:folder", content, "out.println(data[\"jcr:primaryType\"])");
}
public void testCreateNewNodeWithNodeType() throws IOException {
@@ -122,7 +122,7 @@ public class CreateNodeTest extends Http
}
String content = getContent(urlOfNewNode + ".json", CONTENT_TYPE_JSON);
- assertJavascript("nt:folder", content, "out.println(data['jcr:primaryType'])");
+ assertJavascript("nt:folder", content, "out.println(data[\"jcr:primaryType\"])");
}
public void testDeepCreateNodeWithNodeType() throws IOException {
@@ -143,9 +143,10 @@ public class CreateNodeTest extends Http
}
String content = getContent(urlOfNewNode + ".3.json", CONTENT_TYPE_JSON);
- assertJavascript("nt:folder", content, "out.println(data['jcr:primaryType'])");
- assertJavascript("nt:folder", content, "out.println(data.foo['jcr:primaryType'])");
- assertJavascript("nt:folder", content, "out.println(data.foo.bar['jcr:primaryType'])");
+
+ assertJavascript("nt:folder", content, "out.println(data[\"jcr:primaryType\"])");
+ assertJavascript("nt:folder", content, "out.println(data.foo[\"jcr:primaryType\"])");
+ assertJavascript("nt:folder", content, "out.println(data.foo.bar[\"jcr:primaryType\"])");
}
public void testCreateEmptyNode() throws IOException {
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Tue Mar 28 13:03:57 2017
@@ -63,7 +63,7 @@ public class JsonRenderingTest extends H
/** test our assertJavascript method with static json */
public void testAssertJavascript() throws IOException {
- final String json = "{ 'a' : '123', 'b' : '456' }";
+ final String json = "{ \"a\" : \"123\", \"b\" : \"456\" }";
assertJavascript("123456", json, "out.println(data.a + data.b)");
}
@@ -88,10 +88,10 @@ public class JsonRenderingTest extends H
CONTENT_TYPE_JSON);
assertJavascript(testText, json, "out.print(data.text)");
for (String child : children) {
- assertJavascript(child, json, "out.print(data['" + child
- + "'].child)");
- assertJavascript(testText, json, "out.print(data['" + child
- + "'].text)");
+ assertJavascript(child, json, "out.print(data[\"" + child
+ + "\"].child)");
+ assertJavascript(testText, json, "out.print(data[\"" + child
+ + "\"].text)");
}
}
@@ -118,8 +118,8 @@ public class JsonRenderingTest extends H
assertJavascript(testText, json, "out.print(data.text)");
for (String child : children) {
final String testInfo = "extension: " + extension;
- assertJavascript("undefined", json, "out.print(typeof data['"
- + child + "'])", testInfo);
+ assertJavascript("undefined", json, "out.print(typeof data[\""
+ + child + "\"])", testInfo);
}
}
@@ -250,29 +250,29 @@ public class JsonRenderingTest extends H
public void testHarrayRootNoRecursion() throws IOException {
final String json = getContent(HTTP_BASE_URL + "/.harray.json", CONTENT_TYPE_JSON);
- assertJavascript("undefined", json, "out.print(typeof data['__children__'])");
+ assertJavascript("undefined", json, "out.print(typeof data[\"__children__\"])");
}
public void testHarrayRootWithRecursion() throws IOException {
final String json = getContent(HTTP_BASE_URL + "/.harray.1.json", CONTENT_TYPE_JSON);
- assertJavascript("[object Array]", json, "out.print(Object.prototype.toString.call(data['__children__']))");
+ assertJavascript("[object Array]", json, "out.print(Object.prototype.toString.call(data[\"__children__\"]))");
}
public void testHarrayRootNameWithRecursion() throws IOException {
// test if _name is existing in child node
final String json = getContent(HTTP_BASE_URL + "/.harray.1.json", CONTENT_TYPE_JSON);
- assertJavascript("true", json, "out.print(data['__children__'][0].__name__.length > 0)");
+ assertJavascript("true", json, "out.print(data[\"__children__\"][0].__name__.length > 0)");
}
public void testRootNoRecursion() throws IOException {
final String json = getContent(HTTP_BASE_URL + "/.json", CONTENT_TYPE_JSON);
- assertJavascript("rep:root", json, "out.print(data['jcr:primaryType'])");
- assertJavascript("undefined", json, "out.print(typeof data['jcr:system'])");
+ assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
+ assertJavascript("undefined", json, "out.print(typeof data[\"jcr:system\"])");
}
public void testRootWithRecursion() throws IOException {
final String json = getContent(HTTP_BASE_URL + "/.1.json", CONTENT_TYPE_JSON);
- assertJavascript("rep:root", json, "out.print(data['jcr:primaryType'])");
- assertJavascript("rep:system", json, "out.print(data['jcr:system']['jcr:primaryType'])");
+ assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
+ assertJavascript("rep:system", json, "out.print(data[\"jcr:system\"][\"jcr:primaryType\"])");
}
}
\ No newline at end of file
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java Tue Mar 28 13:03:57 2017
@@ -84,7 +84,7 @@ public class GetAclTest {
testUserId = H.createTestUser();
testUserId2 = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -163,7 +163,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_ReplacePrivilegeOnChild() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -218,7 +218,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_FewerPrivilegesGrantedOnChild() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -273,7 +273,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_MorePrivilegesGrantedOnChild() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -329,7 +329,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_SubsetOfPrivilegesDeniedOnChild() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -405,7 +405,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_SubsetOfPrivilegesDeniedOnChild2() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -478,7 +478,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_SupersetOfPrivilegesDeniedOnChild() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
@@ -533,7 +533,7 @@ public class GetAclTest {
public void testEffectiveAclMergeForUser_SupersetOfPrivilegesDeniedOnChild2() throws IOException, JSONException {
testUserId = H.createTestUser();
- String testFolderUrl = H.createTestFolder("{ 'jcr:primaryType': 'nt:unstructured', 'propOne' : 'propOneValue', 'child' : { 'childPropOne' : true } }");
+ String testFolderUrl = H.createTestFolder("{ \"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", \"child\" : { \"childPropOne\" : true } }");
String postUrl = testFolderUrl + ".modifyAce.html";
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java Tue Mar 28 13:03:57 2017
@@ -183,7 +183,7 @@ public class PostServletAtCopyTest exten
// expect new data
String content = getContent(HTTP_BASE_URL + testPath + "/dest.-1.json", CONTENT_TYPE_JSON);
- assertJavascript("Hello", content, "out.println(data.deep['new'].text)");
+ assertJavascript("Hello", content, "out.println(data.deep[\"new\"].text)");
}
public void testCopyNodeDeepAbsolute() throws IOException {
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java Tue Mar 28 13:03:57 2017
@@ -188,7 +188,7 @@ public class PostServletAtMoveTest exten
// expect new data
String content = getContent(HTTP_BASE_URL + testPath + "/dest.-1.json", CONTENT_TYPE_JSON);
- assertJavascript("Hello", content, "out.println(data.deep['new'].text)");
+ assertJavascript("Hello", content, "out.println(data.deep[\"new\"].text)");
}
public void testMoveNodeDeepAbsolute() throws IOException {
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java Tue Mar 28 13:03:57 2017
@@ -32,7 +32,7 @@ public class SlingSessionInfoTest extend
// 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.string.string", content, "out.println(data.userID + '.' + typeof data.workspace + '.' + typeof data.authType)");
+ assertJavascript("admin.string", content, "out.println(data.userID + '.' + typeof data.authType)");
}
public void testNonexistentSlingUrl() throws IOException {
Modified: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport_utf8.json
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport_utf8.json?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport_utf8.json (original)
+++ sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport_utf8.json Tue Mar 28 13:03:57 2017
@@ -1,4 +1,4 @@
{
- 'latin':'øµå',
- 'chinese':'玄牛'
+ "latin":"øµå",
+ "chinese":"玄牛"
}
\ No newline at end of file
Modified: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimportzip.json
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimportzip.json?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimportzip.json (original)
+++ sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimportzip.json Tue Mar 28 13:03:57 2017
@@ -11,7 +11,7 @@
"jcr:lastModifiedBy":"admin",
":jcr:data":21,
"jcr:primaryType":"nt:resource",
- "jcr:mimeType":"text/plain",
+ "jcr:mimeType":"text/plain"
}
}
}
Modified: sling/trunk/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/model.txt?rev=1789125&r1=1789124&r2=1789125&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/model.txt Tue Mar 28 13:03:57 2017
@@ -21,7 +21,7 @@
[artifacts]
org.apache.sling/org.apache.sling.launchpad/9-SNAPSHOT/slingstart
org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
-
+ org.apache.sling/org.apache.sling.commons.json/2.0.20
# additional configuration for testing
[configurations]
@@ -37,7 +37,7 @@
[settings]
org.apache.sling.commons.log.julenabled=true
-
+
# Test repository initialization from provisioning model
# No need to test all repoinit statements, this is done
# by the repoinit it module