Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 77F8210C97 for ; Thu, 19 Sep 2013 12:43:13 +0000 (UTC) Received: (qmail 17463 invoked by uid 500); 19 Sep 2013 12:43:12 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 17428 invoked by uid 500); 19 Sep 2013 12:43:12 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 17421 invoked by uid 99); 19 Sep 2013 12:43:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Sep 2013 12:43:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 19 Sep 2013 12:43:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1FF22388994; Thu, 19 Sep 2013 12:42:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1524718 - in /sling/trunk/launchpad/integration-tests: pom.xml src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java Date: Thu, 19 Sep 2013 12:42:47 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130919124247.B1FF22388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Thu Sep 19 12:42:47 2013 New Revision: 1524718 URL: http://svn.apache.org/r1524718 Log: SLING-3084 - use new forceReload option of JUnitServlet Modified: sling/trunk/launchpad/integration-tests/pom.xml sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java Modified: sling/trunk/launchpad/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1524718&r1=1524717&r2=1524718&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/pom.xml (original) +++ sling/trunk/launchpad/integration-tests/pom.xml Thu Sep 19 12:42:47 2013 @@ -228,7 +228,7 @@ org.apache.sling org.apache.sling.junit.remote - 1.0.8 + 1.0.9-SNAPSHOT org.codehaus.plexus Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java?rev=1524718&r1=1524717&r2=1524718&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java Thu Sep 19 12:42:47 2013 @@ -22,7 +22,9 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.fail; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONObject; @@ -68,7 +70,9 @@ public class ServerSideTestClient extend public TestResults runTests(String testPackageOrClassName) throws Exception { final RemoteTestHttpClient testClient = new RemoteTestHttpClient(serverBaseUrl + "/system/sling/junit",serverUsername,serverPassword,true); final TestResults r = new TestResults(); - final RequestExecutor executor = testClient.runTests(testPackageOrClassName, null, "json"); + final Map options = new HashMap(); + options.put("forceReload", "true"); + final RequestExecutor executor = testClient.runTests(testPackageOrClassName, null, "json", options); executor.assertContentType("application/json"); String content = executor.getContent(); final JSONArray json = new JSONArray(new JSONTokener(content));