You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2012/04/03 14:13:55 UTC
svn commit: r1308840 - in /sling/trunk/launchpad:
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/
test-services/src/main/java/org/apache/sling/launchpad/testservices/post/
Author: bdelacretaz
Date: Tue Apr 3 12:13:55 2012
New Revision: 1308840
URL: http://svn.apache.org/viewvc?rev=1308840&view=rev
Log:
SLING-1725 - integration test for old-style SlingPostOperation
Added:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/OldStylePostOperationExample.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/SlingPostOperationExample.java
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java?rev=1308840&r1=1308839&r2=1308840&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java Tue Apr 3 12:13:55 2012
@@ -23,11 +23,6 @@ import org.apache.sling.commons.testing.
public class CustomPostOperationTest extends HttpTestBase {
private TestNode testNode;
- final String POST_OPERATION_NAME = "test:example";
-
- /** Our example operation adds a property with this name to the node that it processes */
- public static final String MARKER = "org.apache.sling.launchpad.testservices.post.SlingPostOperationExample";
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -35,15 +30,23 @@ public class CustomPostOperationTest ext
final String testPath = "/" + getClass().getSimpleName() + System.currentTimeMillis();
testNode = new TestNode(HTTP_BASE_URL + testPath, null);
}
-
- public void testCustomPostOperation() throws Exception {
+
+ private void assertCustomPostOperation(String operationName, String markerPropertyName) throws Exception {
final String jsonPath = testNode.nodeUrl + ".tidy.json";
- assertFalse("Expecting no marker before POST", getContent(jsonPath, CONTENT_TYPE_JSON).contains(MARKER));
+ assertFalse("Expecting no marker before POST", getContent(jsonPath, CONTENT_TYPE_JSON).contains(markerPropertyName));
final PostMethod post = new PostMethod(testNode.nodeUrl);
- post.addParameter(":operation", POST_OPERATION_NAME);
+ post.addParameter(":operation", operationName);
assertEquals("Expecting 200 status on POST", 200, httpClient.executeMethod(post));
- assertTrue("Expecting marker to be present after POST", getContent(jsonPath, CONTENT_TYPE_JSON).contains(MARKER));
+ assertTrue("Expecting marker to be present after POST", getContent(jsonPath, CONTENT_TYPE_JSON).contains(markerPropertyName));
+ }
+
+ public void testCustomPostOperation() throws Exception {
+ assertCustomPostOperation("test:SlingPostOperationExample", "org.apache.sling.launchpad.testservices.post.SlingPostOperationExample");
+ }
+
+ public void testOldStyleCustomPostOperation() throws Exception {
+ assertCustomPostOperation("test:OldStylePostOperationExample", "org.apache.sling.launchpad.testservices.post.OldStylePostOperationExample");
}
}
Added: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/OldStylePostOperationExample.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/OldStylePostOperationExample.java?rev=1308840&view=auto
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/OldStylePostOperationExample.java (added)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/OldStylePostOperationExample.java Tue Apr 3 12:13:55 2012
@@ -0,0 +1,53 @@
+/*
+ * 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.testservices.post;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.SlingException;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.servlets.HtmlResponse;
+import org.apache.sling.servlets.post.SlingPostOperation;
+import org.apache.sling.servlets.post.SlingPostProcessor;
+
+/** Example using the now deprecated SlingPostOperation */
+@Component(immediate=true)
+@Service
+@Properties({
+ @Property(name=SlingPostOperation.PROP_OPERATION_NAME, value="test:OldStylePostOperationExample")
+})
+public class OldStylePostOperationExample implements SlingPostOperation {
+
+ public void run(SlingHttpServletRequest request, HtmlResponse response, SlingPostProcessor[] processors) {
+ final Resource r = request.getResource();
+ final Node n = r.adaptTo(Node.class);
+ try {
+ response.setPath(r.getPath());
+ response.setTitle("Content modified by " + getClass().getSimpleName());
+ n.setProperty(getClass().getName(), "Old-style operation was applied to " + n.getPath());
+ n.getSession().save();
+ } catch(RepositoryException re) {
+ throw new SlingException(getClass().getSimpleName() + " failed", re);
+ }
+ }
+}
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/SlingPostOperationExample.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/SlingPostOperationExample.java?rev=1308840&r1=1308839&r2=1308840&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/SlingPostOperationExample.java (original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/post/SlingPostOperationExample.java Tue Apr 3 12:13:55 2012
@@ -32,7 +32,7 @@ import org.apache.sling.servlets.post.Sl
/** Example PostOperation used in integration tests */
@Component(immediate=true)
@Service
-@Property(name=PostOperation.PROP_OPERATION_NAME, value="test:example")
+@Property(name=PostOperation.PROP_OPERATION_NAME, value="test:SlingPostOperationExample")
public class SlingPostOperationExample implements PostOperation {
public void run(SlingHttpServletRequest request, PostResponse response, SlingPostProcessor[] processors) {
final Resource r = request.getResource();