svn commit: r1524718 - in /sling/trunk/launchpad/integration-tests: pom.xml src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java

[bdelacretaz]

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 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.junit.remote</artifactId>
-      <version>1.0.8</version>
+      <version>1.0.9-SNAPSHOT</version>
     </dependency>
     <dependency>
        <groupId>org.codehaus.plexus</groupId>

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<String, String> options = new HashMap<String, String>();
+        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));