Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 49674 invoked from network); 20 May 2008 15:06:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 May 2008 15:06:09 -0000 Received: (qmail 47141 invoked by uid 500); 20 May 2008 15:06:11 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 47099 invoked by uid 500); 20 May 2008 15:06:11 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 47090 invoked by uid 99); 20 May 2008 15:06:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 08:06:11 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 15:05:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F1132388A10; Tue, 20 May 2008 08:05:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r658272 - in /incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling: commons/ commons/testing/ commons/testing/integration/ launchpad/webapp/integrationtest/ launchpad/webapp/integrationtest/apt/ launchpad/webapp/integration... Date: Tue, 20 May 2008 15:05:46 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080520150548.1F1132388A10@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Tue May 20 08:05:45 2008 New Revision: 658272 URL: http://svn.apache.org/viewvc?rev=658272&view=rev Log: SLING-467 - preparing to move HttpTestBase to commons/testing Added: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java (with props) incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpTestBase.java - copied, changed from r658265, 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/commons/testing/integration/SlingIntegrationTestClient.java (with props) Removed: 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/helpers/HttpStatusCodeException.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/helpers/UslingIntegrationTestClient.java Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.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/RedirectTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.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/ValueFromTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.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/PostStatusTest.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 Added: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java?rev=658272&view=auto ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java (added) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java Tue May 20 08:05:45 2008 @@ -0,0 +1,47 @@ +/* + * 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.commons.testing.integration; + +import java.io.IOException; + +@SuppressWarnings("serial") +public class HttpStatusCodeException extends IOException { + + private final int expectedStatus; + + private final int actualStatus; + + public HttpStatusCodeException(int expectedStatus, int actualStatus, + String method, String url) { + + super("Expected status code " + expectedStatus + " for " + method + + ", got " + actualStatus + ", URL=" + url); + + this.expectedStatus = expectedStatus; + this.actualStatus = actualStatus; + } + + public int getExpectedStatus() { + return expectedStatus; + } + + public int getActualStatus() { + return actualStatus; + } +} Propchange: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpStatusCodeException.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Copied: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpTestBase.java (from r658265, 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/commons/testing/integration/HttpTestBase.java?p2=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/HttpTestBase.java&p1=incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java&r1=658265&r2=658272&rev=658272&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/commons/testing/integration/HttpTestBase.java Tue May 20 08:05:45 2008 @@ -14,7 +14,7 @@ * 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.commons.testing.integration; import java.io.IOException; import java.io.InputStream; @@ -38,8 +38,6 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpAnyMethod; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpStatusCodeException; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.UslingIntegrationTestClient; import org.apache.sling.servlets.post.SlingPostConstants; import org.mozilla.javascript.Context; import org.mozilla.javascript.ScriptableObject; @@ -61,7 +59,7 @@ public static final String SLING_RESOURCE_TYPE = "sling:resourceType"; - protected UslingIntegrationTestClient testClient; + protected SlingIntegrationTestClient testClient; protected HttpClient httpClient; private static Boolean slingStartupOk; @@ -122,7 +120,7 @@ Credentials defaultcreds = new UsernamePasswordCredentials("admin", "admin"); httpClient.getState().setCredentials(new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM), defaultcreds); - testClient = new UslingIntegrationTestClient(httpClient); + testClient = new SlingIntegrationTestClient(httpClient); waitForSlingStartup(); } Added: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java?rev=658272&view=auto ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java (added) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java Tue May 20 08:05:45 2008 @@ -0,0 +1,194 @@ +/* + * 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.commons.testing.integration; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.DeleteMethod; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.commons.httpclient.methods.InputStreamRequestEntity; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.multipart.FilePart; +import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; +import org.apache.commons.httpclient.methods.multipart.Part; +import org.apache.commons.httpclient.methods.multipart.StringPart; +import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpAnyMethod; + +/** Client functions to interact with Sling in integration tests */ +public class SlingIntegrationTestClient { + private final HttpClient httpClient; + + public SlingIntegrationTestClient(HttpClient client) { + this.httpClient = client; + } + + /** Upload a file to the microsling repository + * @return the HTTP status code + */ + public int upload(String toUrl, InputStream is) throws IOException { + final PutMethod put = new PutMethod(toUrl); + put.setRequestEntity(new InputStreamRequestEntity(is)); + return httpClient.executeMethod(put); + } + + /** Delete a file from the microsling repository + * @return the HTTP status code + */ + public int delete(String url) throws IOException { + final DeleteMethod delete = new DeleteMethod(url); + return httpClient.executeMethod(delete); + } + + /** Create the given directory via WebDAV, if needed, under given URL */ + public void mkdir(String url) throws IOException { + int status = 0; + status = httpClient.executeMethod(new GetMethod(url)); + if(status != 200) { + status = httpClient.executeMethod(new HttpAnyMethod("MKCOL",url)); + if(status!=201) { + throw new IOException("mkdir(" + url + ") failed, status code=" + status); + } + } + } + + /** Create the given directory via WebDAV, including parent directories */ + public void mkdirs(String baseUrl,String path) throws IOException { + final String [] paths = path.split("/"); + if(baseUrl.endsWith("/")) { + baseUrl = baseUrl.substring(0,baseUrl.length() - 1); + } + + String currentPath = baseUrl; + for(String pathElement : paths) { + if(pathElement.length() == 0) { + continue; + } + currentPath += "/" + pathElement; + mkdir(currentPath); + } + + final String url = baseUrl + path; + final int status = httpClient.executeMethod(new GetMethod(url)); + if(status!=200) { + throw new HttpStatusCodeException(200, status, "GET", url); + } + } + + /** Call the other createNode method with headers==null */ + public String createNode(String url, Map nodeProperties) throws IOException { + return createNode(url, nodeProperties, null, false); + } + + /** Create a node under given path, using a POST to microsling + * @param url under which node is created + * @param multiPart if true, does a multipart POST + * @return the URL that microsling provides to display the node + */ + public String createNode(String url, Map clientNodeProperties, Map requestHeaders,boolean multiPart) + throws IOException { + final PostMethod post = new PostMethod(url); + post.setFollowRedirects(false); + + // create a private copy of the properties to not tamper with + // the properties of the client + Map nodeProperties = new HashMap(); + + // add sling specific properties + nodeProperties.put(":redirect", url); + nodeProperties.put(":displayExtension", ""); + nodeProperties.put(":status", "browser"); + + // take over any client provided properties + if (clientNodeProperties != null) { + nodeProperties.putAll(clientNodeProperties); + } else { + // add fake property - otherwise the node is not created + nodeProperties.put("jcr:created", ""); + } + + // force form encoding to UTF-8, which is what we use to convert the + // string parts into stream data + nodeProperties.put("_charset_", "UTF-8"); + + if( nodeProperties.size() > 0) { + if(multiPart) { + final List partList = new ArrayList(); + for(Map.Entry e : nodeProperties.entrySet()) { + if (e.getValue() != null) { + partList.add(new StringPart(e.getKey().toString(), e.getValue().toString(), "UTF-8")); + } + } + final Part [] parts = partList.toArray(new Part[partList.size()]); + post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams())); + } else { + for(Map.Entry e : nodeProperties.entrySet()) { + post.addParameter(e.getKey(),e.getValue()); + } + } + } + + if(requestHeaders != null) { + for(Map.Entry e : requestHeaders.entrySet()) { + post.addRequestHeader(e.getKey(), e.getValue()); + } + } + + final int status = httpClient.executeMethod(post); + if(status!=302) { + throw new HttpStatusCodeException(302, status, "POST", url); + } + String location = post.getResponseHeader("Location").getValue(); + post.releaseConnection(); + // simple check if host is missing + if (!location.startsWith("http://")) { + String host = HttpTestBase.HTTP_BASE_URL; + int idx = host.indexOf('/', 8); + if (idx > 0) { + host = host.substring(0, idx); + } + location = host + location; + } + return location; + } + + /** Upload to an file node structure, see SLING-168 */ + public void uploadToFileNode(String url, File localFile, String fieldName, String typeHint) + throws IOException { + + final Part[] parts = new Part[typeHint == null ? 1 : 2]; + parts[0] = new FilePart(fieldName, localFile); + if (typeHint != null) { + parts[1] = new StringPart(fieldName + "@TypeHint", typeHint); + } + final PostMethod post = new PostMethod(url); + post.setFollowRedirects(false); + post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams())); + + final int status = httpClient.executeMethod(post); + if(status!=200) { // fmeschbe: The default sling status is 200, not 302 + throw new HttpStatusCodeException(200, status, "POST", url); + } + } +} Propchange: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java Tue May 20 08:05:45 2008 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** Test creating a Node using the MicroslingIntegrationTestClient */ public class CreateNodeTest extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java Tue May 20 08:05:45 2008 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Test uploading files to the Sling repository * via WebDAV, as a first step towards testing the * complete content creation and rendering scenario. Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the generation of node names for POST requests to URLS Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java Tue May 20 08:05:45 2008 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the generation of node names for POST requests to URLS Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java Tue May 20 08:05:45 2008 @@ -18,6 +18,8 @@ import java.io.IOException; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** A GET to *.html and *.json must work even if there is no Node * at the specified path (SLING-344) */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java Tue May 20 08:05:45 2008 @@ -18,6 +18,7 @@ import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** Ping the Sling server to verify that our integration test Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java Tue May 20 08:05:45 2008 @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the {link ScriptHelper#include) functionality */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java Tue May 20 08:05:45 2008 @@ -17,6 +17,8 @@ import java.io.IOException; +import org.apache.sling.commons.testing.integration.HttpTestBase; + public class InitialContentTest extends HttpTestBase { public void testIndex() throws IOException { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Test Scriptable objects */ public class JavascriptWrappersTest extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java Tue May 20 08:05:45 2008 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.commons.httpclient.NameValuePair; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** Test the {link JsonQueryServlet) functionality. Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Tue May 20 08:05:45 2008 @@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test creating Nodes and rendering them in JSON */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java Tue May 20 08:05:45 2008 @@ -16,6 +16,7 @@ */ package org.apache.sling.launchpad.webapp.integrationtest; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test JSP scripting Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java Tue May 20 08:05:45 2008 @@ -18,6 +18,8 @@ import java.io.IOException; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Test the MicroslingIntegrationTestClient's mkdir functions */ public class MkdirTest extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Test the SLING-340 way of deriving the resource type from * the content path. */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the various redirect options for POST, SLING-126 */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java Tue May 20 08:05:45 2008 @@ -23,6 +23,7 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test creating Nodes and rendering them in JSON */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java Tue May 20 08:05:45 2008 @@ -18,6 +18,8 @@ import java.io.IOException; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Base class for rendering tests */ class RenderingTestBase extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,8 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Some tests about static content */ public class StaticContentTest extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,8 @@ import java.io.IOException; +import org.apache.sling.commons.testing.integration.HttpTestBase; + /** Test the SLING-129 {@link org.apache.sling.api.resource.SyntheticResource}, by requesting * non-existent Nodes.. 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** * Test uploading files using the Sling post servlet (SLING-168) Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java Tue May 20 08:05:45 2008 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the @ValueFrom field name suffix, SLING-130 */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java Tue May 20 08:05:45 2008 @@ -16,7 +16,7 @@ */ package org.apache.sling.launchpad.webapp.integrationtest.apt; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; public class SimpleAptRenderingTest extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java Tue May 20 08:05:45 2008 @@ -24,7 +24,7 @@ import org.apache.sling.api.SlingConstants; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; public class SLING457Test extends HttpTestBase { Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java Tue May 20 08:05:45 2008 @@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test item copy support by @CopyFrom suffix (SLING-455) */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java Tue May 20 08:05:45 2008 @@ -26,7 +26,7 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.sling.commons.json.JSONObject; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test support of @Delete suffix of SLING-458 */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java Tue May 20 08:05:45 2008 @@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test item move support by @MoveFrom suffix (SLING-455) */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java Tue May 20 08:05:45 2008 @@ -26,8 +26,8 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.sling.commons.json.JSONObject; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test node copy via the MicrojaxPostServlet */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test node creation via the MicrojaxPostServlet */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.NameValuePair; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test node deletion via the MicrojaxPostServlet */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -26,8 +26,8 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.sling.commons.json.JSONObject; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; -import org.apache.sling.launchpad.webapp.integrationtest.helpers.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpStatusCodeException; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test node move via the MicrojaxPostServlet */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -23,7 +23,7 @@ import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** Test the order option for node creation via the MicrojaxPostServlet */ public class PostServletOrderTest extends HttpTestBase { 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test node updates via the MicrojaxPostServlet */ Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java?rev=658272&r1=658271&r2=658272&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java Tue May 20 08:05:45 2008 @@ -19,7 +19,7 @@ import java.io.IOException; import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the various status options for POST, SLING-422 */ 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** {#link MicrojaxPropertyValueSetter} sets the value of some properties 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -23,7 +23,7 @@ import java.util.Locale; import java.util.Map; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; import org.apache.sling.servlets.post.SlingPostConstants; /** {#link SlingPropertyValueSetter} sets the value of some properties 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=658272&r1=658271&r2=658272&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 Tue May 20 08:05:45 2008 @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.sling.launchpad.webapp.integrationtest.HttpTestBase; +import org.apache.sling.commons.testing.integration.HttpTestBase; /** Test the sling:sessionInfo resource */