svn commit: r1733075 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration: HttpTestBase.java SlingIntegrationTestClient.java

[bd...@apache.org]

Author: bdelacretaz
Date: Tue Mar  1 14:13:59 2016
New Revision: 1733075

URL: http://svn.apache.org/viewvc?rev=1733075&view=rev
Log:
SLING-5575 - propagate readiness media type to SlingIntegrationTestClient

Modified:
    sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
    sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java

Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java?rev=1733075&r1=1733074&r2=1733075&view=diff
==============================================================================
--- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java (original)
+++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/HttpTestBase.java Tue Mar  1 14:13:59 2016
@@ -175,6 +175,7 @@ public class HttpTestBase extends TestCa
         httpClient.getState().setCredentials(new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM), defaultcreds);
 
         testClient = new SlingIntegrationTestClient(httpClient);
+        testClient.setFolderExistsTestExtension(readinessCheckExtension);
 
         waitForSlingStartup();
     }

Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java?rev=1733075&r1=1733074&r2=1733075&view=diff
==============================================================================
--- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java (original)
+++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java Tue Mar  1 14:13:59 2016
@@ -39,10 +39,21 @@ import org.apache.commons.httpclient.met
 /** Client functions to interact with Sling in integration tests */
 public class SlingIntegrationTestClient {
     private final HttpClient httpClient;
+    
+    /** Extension to use to check if a folder exists */
+    private String folderExistsTestExtension = ".txt";
 
     public SlingIntegrationTestClient(HttpClient client) {
         this.httpClient = client;
     }
+    
+    public String getFolderExistsTestExtension() {
+        return folderExistsTestExtension;
+    }
+
+    public void setFolderExistsTestExtension(String folderExistsTestExtension) {
+        this.folderExistsTestExtension = folderExistsTestExtension;
+    }
 
     /** Upload a file to the Sling repository
      *  @return the HTTP status code
@@ -64,7 +75,7 @@ public class SlingIntegrationTestClient
     /** 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 + ".txt"));
+        status = httpClient.executeMethod(new GetMethod(url + folderExistsTestExtension));
         if(status != 200) {
             status = httpClient.executeMethod(new HttpAnyMethod("MKCOL",url));
             if(status!=201) {
@@ -90,7 +101,7 @@ public class SlingIntegrationTestClient
         }
 
         final String url = baseUrl + path;
-        final int status = httpClient.executeMethod(new GetMethod(url + ".txt"));
+        final int status = httpClient.executeMethod(new GetMethod(url + folderExistsTestExtension));
         if(status!=200) {
             throw new HttpStatusCodeException(200, status, "GET", url);
         }