Author: fmeschbe
Date: Thu Jan 22 07:33:17 2009
New Revision: 736674
URL: http://svn.apache.org/viewvc?rev=736674&view=rev
Log:
SLING-837 copy JCR Install testcases to the launchpad/testing module
and include them in the jcrinstall-tests profile
Added:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
(contents, props changed)
- copied, changed from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/HttpPingTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
(contents, props changed)
- copied, changed from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/InstallClonedBundlesTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
(contents, props changed)
- copied, changed from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/JcrinstallTestBase.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
(contents, props changed)
- copied, changed from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndChangeBundlesTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
(contents, props changed)
- copied, changed from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndRestartTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/
(props changed)
- copied from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/util/
Modified:
incubator/sling/trunk/launchpad/testing/pom.xml
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/BundleCloner.java
Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=736674&r1=736673&r2=736674&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Thu Jan 22 07:33:17 2009
@@ -80,6 +80,33 @@
started. Useful to manually test the integration testing webapp.
-->
<integration.test.wait>false</integration.test.wait>
+
+ <!--
+ Defines the part of the tree, which must not be compiled in
+ normal test scenarios. The jcrinstall-tests profile will
+ compile these classes to be included in a full-test scenario.
+ -->
+ <jcrinstall.integration.test.code.path>
+ **/jcrinstall/**
+ </jcrinstall.integration.test.code.path>
+
+ <!--
+ Where to copy our test bundles
+ Used when profile jcrinstall-tests is active
+ -->
+
<sling.testbundles.path>${project.build.directory}/testbundles</sling.testbundles.path>
+
+ <!--
+ Can be used to run tests with more or less bundles
+ Used when profile jcrinstall-tests is active
+ -->
+ <sling.test.scale.factor>1</sling.test.scale.factor>
+
+ <!--
+ How long to wait for the expected number of bundles to be active,
in tests
+ Used when profile jcrinstall-tests is active
+ -->
+ <sling.test.bundles.wait.seconds>20</sling.test.bundles.wait.seconds>
</properties>
<build>
@@ -214,6 +241,25 @@
</executions>
</plugin>
+ <!--
+ Exclude the JCRInstall test classes from default build
+ See jcrinstall-tests for the setup of compilation of these
+ classes for a full test
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <sumpf>gurk</sumpf>
+ <testExcludes>
+ <testExclude>
+ ${jcrinstall.integration.test.code.path}
+ </testExclude>
+ </testExcludes>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+
<!--
Include sling-app launcher classes and resources, but no Sling
bundles (we want to specify our own versions)
@@ -353,6 +399,20 @@
http://${test.host}:${http.port}/${project.build.finalName}/${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>
</execution>
@@ -432,6 +492,96 @@
</plugins>
</build>
</profile>
+
+ <!--
+ The jcrinstall-tests profile includes the integration tests
+ for the JCRInstall functionality in the integration tests. By
+ default this profile is disabled.
+ For CI builds it is recommended to activate this profile, for
+ normal builds you may omit this profile
+ -->
+ <profile>
+ <id>jcrinstall-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-jcrinstall-dependencies</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>
+
${project.build.directory}/launchpad-bundles/resources/0
+ </outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ <includeArtifactIds>
+
org.apache.sling.jcr.jcrinstall,org.apache.sling.jcr.jcrinstall.testbundles.observer,org.apache.sling.jcr.jcrinstall.servlet,org.apache.sling.runmode
+ </includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile-jcrinstall-tests</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <testIncludes>
+ <testInclude>
+
${jcrinstall.integration.test.code.path}
+ </testInclude>
+ </testIncludes>
+ <!-- overwrite global setting here -->
+ <testExcludes>
+ <testExclude>
+ dummymarker
+ </testExclude>
+ </testExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>org.apache.sling.jcr.jcrinstall.testbundles.observer</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>org.apache.sling.jcr.jcrinstall.servlet</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.runmode</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<dependencies>
@@ -463,6 +613,19 @@
<scope>provided</scope>
</dependency>
+ <!-- JCR Install - needs to be in a profile -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>0.0.169</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Dependencies for the Test Build and Run -->
<dependency>
<groupId>org.apache.sling</groupId>
Copied:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
(from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/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?p2=incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java&p1=incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/HttpPingTest.java&r1=736604&r2=736674&rev=736674&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/HttpPingTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
import org.apache.commons.httpclient.methods.GetMethod;
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/HttpPingTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
(from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/InstallClonedBundlesTest.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java?p2=incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java&p1=incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/InstallClonedBundlesTest.java&r1=736604&r2=736674&rev=736674&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/InstallClonedBundlesTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
import java.util.LinkedList;
import java.util.List;
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/InstallClonedBundlesTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
(from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/JcrinstallTestBase.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java?p2=incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java&p1=incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/JcrinstallTestBase.java&r1=736604&r2=736674&rev=736674&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/JcrinstallTestBase.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -26,7 +26,7 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.jcr.jcrinstall.integrationtest.util.BundleCloner;
+import
org.apache.sling.launchpad.webapp.integrationtest.jcrinstall.util.BundleCloner;
import org.osgi.framework.Bundle;
/** Base class for jcrinstall test cases */
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/JcrinstallTestBase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
(from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndChangeBundlesTest.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java?p2=incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java&p1=incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndChangeBundlesTest.java&r1=736604&r2=736674&rev=736674&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndChangeBundlesTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
import java.util.LinkedList;
import java.util.List;
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndChangeBundlesTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
(from r736604,
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndRestartTest.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java?p2=incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java&p1=incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndRestartTest.java&r1=736604&r2=736674&rev=736674&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/StopAndRestartTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall;
import java.util.LinkedList;
import java.util.List;
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/StopAndRestartTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/BundleCloner.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/BundleCloner.java?rev=736674&r1=736604&r2=736674&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/BundleCloner.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/util/BundleCloner.java
Thu Jan 22 07:33:17 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.jcr.jcrinstall.integrationtest.util;
+package org.apache.sling.launchpad.webapp.integrationtest.jcrinstall.util;
import java.io.File;
import java.io.FileOutputStream;
