SLING-738 - fix broken jcrinstall integration tests (still somewhat broken, see SLING-738)
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk@741167 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index b9b52e5..49b499d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,11 +90,14 @@
**/jcrinstall/**
</jcrinstall.integration.test.code.path>
+ <resources.bundles.path>${project.build.directory}/launchpad-bundles/resources/bundles</resources.bundles.path>
+
<!--
Where to copy our test bundles
- Used when profile jcrinstall-tests is active
+ Used when profile jcrinstall-tests is active.
-->
- <sling.testbundles.path>${project.build.directory}/testbundles</sling.testbundles.path>
+ <jcrinstall.start.level>0</jcrinstall.start.level>
+ <sling.testbundles.path>${resources.bundles.path}/${jcrinstall.start.level}</sling.testbundles.path>
<!--
Can be used to run tests with more or less bundles
@@ -228,7 +231,7 @@
</goals>
<configuration>
<outputDirectory>
- ${project.build.directory}/launchpad-bundles/resources/bundles/0
+ ${resources.bundles.path}/0
</outputDirectory>
<excludeTransitive>true</excludeTransitive>
<includeArtifactIds>
@@ -315,6 +318,20 @@
http://${test.host}:${http.port}/${webdav.workspace.path}
</value>
</property>
+
+ <!-- system properties used for profile jcrinstall-tests -->
+ <property>
+ <name>sling.testbundles.path</name>
+ <value>${sling.testbundles.path}</value>
+ </property>
+ <property>
+ <name>sling.test.scale.factor</name>
+ <value>${sling.test.scale.factor}</value>
+ </property>
+ <property>
+ <name>sling.test.bundles.wait.seconds</name>
+ <value>${sling.test.bundles.wait.seconds}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -520,7 +537,7 @@
</goals>
<configuration>
<outputDirectory>
- ${project.build.directory}/launchpad-bundles/resources/bundles/0
+ ${resources.bundles.path}/${jcrinstall.start.level}
</outputDirectory>
<excludeTransitive>true</excludeTransitive>
<includeArtifactIds>
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
index e1586da..5f27846 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
-import org.apache.commons.httpclient.methods.GetMethod;
/** Ping the Sling server to verify that our integration test
* setup is ok.
@@ -26,7 +25,7 @@
public void testWebServerRoot() throws Exception
{
final String url = HTTP_BASE_URL + "/";
- assertHttpStatus(url, 403, "Root should return 403 as no redirect is setup in the repository");
+ assertHttpStatus(url, 200, "Root should return 200 when running inside the launchpad/testing environment");
}
public void test404() throws Exception
