Return-Path: 
 <sling-commits-return-4599-apmail-incubator-sling-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-sling-commits-archive@minotaur.apache.org
Received: (qmail 76461 invoked from network); 5 Feb 2009 16:29:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Feb 2009 16:29:27 -0000
Received: (qmail 66142 invoked by uid 500); 5 Feb 2009 16:29:27 -0000
Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org
Received: (qmail 66121 invoked by uid 500); 5 Feb 2009 16:29:27 -0000
Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:sling-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:sling-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:sling-commits@incubator.apache.org>
List-Id: <sling-commits.incubator.apache.org>
Reply-To: sling-dev@incubator.apache.org
Delivered-To: mailing list sling-commits@incubator.apache.org
Received: (qmail 66112 invoked by uid 99); 5 Feb 2009 16:29:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2009 08:29:27 -0800
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; Thu, 05 Feb 2009 16:29:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1FB38238898E; Thu,  5 Feb 2009 16:29:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r741167 - in /incubator/sling/trunk/launchpad/testing:
 pom.xml
 src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
Date: Thu, 05 Feb 2009 16:29:05 -0000
To: sling-commits@incubator.apache.org
From: bdelacretaz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090205162906.1FB38238898E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bdelacretaz
Date: Thu Feb  5 16:29:05 2009
New Revision: 741167

URL: http://svn.apache.org/viewvc?rev=741167&view=rev
Log:
SLING-738 - fix broken jcrinstall integration tests (still somewhat broken, see SLING-738)

Modified:
    incubator/sling/trunk/launchpad/testing/pom.xml
    incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java

Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=741167&r1=741166&r2=741167&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Thu Feb  5 16:29:05 2009
@@ -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>

Modified: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java?rev=741167&r1=741166&r2=741167&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java (original)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java Thu Feb  5 16:29:05 2009
@@ -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