You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2011/02/21 00:05:21 UTC
svn commit: r1072799 - in /sling/trunk: bundles/extensions/groovy/
bundles/extensions/groovy/src/test/java/org/
bundles/extensions/groovy/src/test/java/org/apache/
bundles/extensions/groovy/src/test/java/org/apache/sling/
bundles/extensions/groovy/src/...
Author: justin
Date: Sun Feb 20 23:05:20 2011
New Revision: 1072799
URL: http://svn.apache.org/viewvc?rev=1072799&view=rev
Log:
moving groovy tests to groovy bundle (won't run automatically) and removing groovy bundle from launchpad.builder
Added:
sling/trunk/bundles/extensions/groovy/src/test/java/org/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/GroovySlingResourceTypeRenderingIT.java
sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/JSONGroovyBuilderIT.java
- copied, changed from r1072796, sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderIntegrationTest.java
sling/trunk/bundles/extensions/groovy/src/test/resources/
sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/
sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder.groovy
- copied, changed from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder.groovy
sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder2.groovy
- copied, changed from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder2.groovy
sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/rendering-test.gsp
- copied, changed from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/rendering-test.gsp
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
Removed:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderIntegrationTest.java
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder.groovy
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder2.groovy
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/rendering-test.gsp
Modified:
sling/trunk/bundles/extensions/groovy/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
Modified: sling/trunk/bundles/extensions/groovy/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/pom.xml?rev=1072799&r1=1072798&r2=1072799&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/groovy/pom.xml (original)
+++ sling/trunk/bundles/extensions/groovy/pom.xml Sun Feb 20 23:05:20 2011
@@ -110,5 +110,11 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/GroovySlingResourceTypeRenderingIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/GroovySlingResourceTypeRenderingIT.java?rev=1072799&view=auto
==============================================================================
--- sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/GroovySlingResourceTypeRenderingIT.java (added)
+++ sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/GroovySlingResourceTypeRenderingIT.java Sun Feb 20 23:05:20 2011
@@ -0,0 +1,51 @@
+package org.apache.sling.extensions.groovy.it;
+
+import java.io.IOException;
+
+import org.apache.sling.launchpad.webapp.integrationtest.AbstractSlingResourceTypeRenderingTest;
+
+public class GroovySlingResourceTypeRenderingIT extends AbstractSlingResourceTypeRenderingTest {
+
+ public void testGspJavaCode() throws IOException {
+ final String toDelete = uploadTestScript("rendering-test.gsp","html.gsp");
+ try {
+ final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
+ assertContains(content, "GSP template");
+ assertContains(content, "TestLinkedListTest");
+ } finally {
+ testClient.delete(toDelete);
+ }
+ }
+
+ public void testGspHtml() throws IOException {
+ final String toDelete = uploadTestScript("rendering-test.gsp","html.gsp");
+ try {
+ final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
+ assertContains(content, "GSP template");
+ assertContains(content, "<p>" + testText + "</p>");
+ assertContains(content, "<div class=\"SLING-142\" id=\"22\"/>");
+ } finally {
+ testClient.delete(toDelete);
+ }
+ }
+
+ public void testGspHtmlInAppsFolder() throws IOException {
+ // make sure there's no leftover rendering script
+ {
+ final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
+ assertFalse("Content must not contain script marker before testing", content.contains("GSP template"));
+ }
+
+ // put our script under /apps/<resource type>
+ final String path = "/apps/" + slingResourceType;
+ testClient.mkdirs(WEBDAV_BASE_URL, path);
+ final String toDelete = uploadTestScript(path,"rendering-test.gsp","html.gsp");
+ try {
+ final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
+ assertContains(content, "GSP template");
+ assertContains(content, "<p>" + testText + "</p>");
+ } finally {
+ testClient.delete(toDelete);
+ }
+ }
+}
Copied: sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/JSONGroovyBuilderIT.java (from r1072796, sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderIntegrationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/JSONGroovyBuilderIT.java?p2=sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/JSONGroovyBuilderIT.java&p1=sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderIntegrationTest.java&r1=1072796&r2=1072799&rev=1072799&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JSONGroovyBuilderIntegrationTest.java (original)
+++ sling/trunk/bundles/extensions/groovy/src/test/java/org/apache/sling/extensions/groovy/it/JSONGroovyBuilderIT.java Sun Feb 20 23:05:20 2011
@@ -1,20 +1,4 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.extensions.groovy.it;
import java.io.IOException;
import java.util.HashMap;
@@ -22,10 +6,10 @@ import java.util.Map;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
-public class JSONGroovyBuilderIntegrationTest extends RenderingTestBase {
-
+public class JSONGroovyBuilderIT extends RenderingTestBase {
private String slingResourceType;
@Override
Copied: sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder.groovy (from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder.groovy)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder.groovy?p2=sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder.groovy&p1=sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder.groovy&r1=1072796&r2=1072799&rev=1072799&view=diff
==============================================================================
(empty)
Copied: sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder2.groovy (from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder2.groovy)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder2.groovy?p2=sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/builder2.groovy&p1=sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/builder2.groovy&r1=1072796&r2=1072799&rev=1072799&view=diff
==============================================================================
(empty)
Copied: sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/rendering-test.gsp (from r1072796, sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/rendering-test.gsp)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/rendering-test.gsp?p2=sling/trunk/bundles/extensions/groovy/src/test/resources/integration-test/rendering-test.gsp&p1=sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/rendering-test.gsp&r1=1072796&r2=1072799&rev=1072799&view=diff
==============================================================================
(empty)
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1072799&r1=1072798&r2=1072799&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Sun Feb 20 23:05:20 2011
@@ -172,11 +172,6 @@
<artifactId>groovy-all</artifactId>
<version>1.7.4</version>
</bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.extensions.groovy</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </bundle>
<!-- felix httpservice whiteboard -->
<bundle>
Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java?rev=1072799&view=auto
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java (added)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java Sun Feb 20 23:05:20 2011
@@ -0,0 +1,37 @@
+package org.apache.sling.launchpad.webapp.integrationtest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.sling.servlets.post.SlingPostConstants;
+
+/** Base abstract test for creating a Node and rendering it using scripts in
+ * various supported languages, using slingResourceType-based
+ * script resolution
+ */
+public abstract class AbstractSlingResourceTypeRenderingTest extends RenderingTestBase {
+
+ protected String slingResourceType;
+ protected String secondFolderOfContentPath;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // set test values
+ slingResourceType = "integration-test/srt." + System.currentTimeMillis();
+ testText = "This is a test " + System.currentTimeMillis();
+
+ // create the test node, under a path that's specific to this class to allow collisions
+ secondFolderOfContentPath = "" + System.currentTimeMillis();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String,String> props = new HashMap<String,String>();
+ props.put("sling:resourceType", slingResourceType);
+ props.put("text", testText);
+ displayUrl = testClient.createNode(url, props);
+
+ // the rendering script goes under /apps in the repository
+ scriptPath = "/apps/" + slingResourceType;
+ testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
+ }
+}
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=1072799&r1=1072798&r2=1072799&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java Sun Feb 20 23:05:20 2011
@@ -22,7 +22,7 @@ import org.apache.sling.commons.testing.
/** Base class for rendering tests
*/
-abstract class RenderingTestBase extends HttpTestBase {
+public abstract class RenderingTestBase extends HttpTestBase {
protected String scriptPath;
protected String testText;
protected String displayUrl;
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=1072799&r1=1072798&r2=1072799&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Sun Feb 20 23:05:20 2011
@@ -17,40 +17,12 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.sling.servlets.post.SlingPostConstants;
/** Test creating a Node and rendering it using scripts in
* various supported languages, using slingResourceType-based
* script resolution
*/
-public class SlingResourceTypeRenderingTest extends RenderingTestBase {
-
- private String slingResourceType;
- private String secondFolderOfContentPath;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- // set test values
- slingResourceType = "integration-test/srt." + System.currentTimeMillis();
- testText = "This is a test " + System.currentTimeMillis();
-
- // create the test node, under a path that's specific to this class to allow collisions
- secondFolderOfContentPath = "" + System.currentTimeMillis();
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
- props.put("sling:resourceType", slingResourceType);
- props.put("text", testText);
- displayUrl = testClient.createNode(url, props);
-
- // the rendering script goes under /apps in the repository
- scriptPath = "/apps/" + slingResourceType;
- testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- }
+public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRenderingTest {
public void testWithoutScriptTxt() throws IOException {
final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
@@ -74,18 +46,6 @@ public class SlingResourceTypeRenderingT
}
}
- public void testGspHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.gsp","html.gsp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "GSP template");
- assertContains(content, "<p>" + testText + "</p>");
- assertContains(content, "<div class=\"SLING-142\" id=\"22\"/>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
public void testEspJavaCode() throws IOException {
final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
try {
@@ -97,17 +57,6 @@ public class SlingResourceTypeRenderingT
}
}
- public void testGspJavaCode() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.gsp","html.gsp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "GSP template");
- assertContains(content, "TestLinkedListTest");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
public void testEspHtmlInAppsFolder() throws IOException {
// make sure there's no leftover rendering script
{
@@ -128,26 +77,6 @@ public class SlingResourceTypeRenderingT
}
}
- public void testGspHtmlInAppsFolder() throws IOException {
- // make sure there's no leftover rendering script
- {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertFalse("Content must not contain script marker before testing", content.contains("GSP template"));
- }
-
- // put our script under /apps/<resource type>
- final String path = "/apps/" + slingResourceType;
- testClient.mkdirs(WEBDAV_BASE_URL, path);
- final String toDelete = uploadTestScript(path,"rendering-test.gsp","html.gsp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "GSP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
public void TODO_FAILS_testEspHtmlWithContentBasedPath() throws IOException {
// make sure there's no leftover rendering script