You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2014/01/23 12:06:49 UTC
svn commit: r1560635 - in /sling/trunk/testing:
samples/integration-tests/pom.xml
tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java
Author: bdelacretaz
Date: Thu Jan 23 11:06:49 2014
New Revision: 1560635
URL: http://svn.apache.org/r1560635
Log:
SLING-3331 - accept a list of paths for additional bundles in SlingTestBase
Modified:
sling/trunk/testing/samples/integration-tests/pom.xml
sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java
Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1560635&r1=1560634&r2=1560635&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Thu Jan 23 11:06:49 2014
@@ -274,7 +274,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.tools</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java?rev=1560635&r1=1560634&r2=1560635&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Thu Jan 23 11:06:49 2014
@@ -153,14 +153,19 @@ public class SlingTestBase {
if(installBundlesFailed) {
fail("Bundles could not be installed, cannot run tests");
} else if(!extraBundlesInstalled) {
- final String path = System.getProperty(ADDITONAL_BUNDLES_PATH);
- if(path == null) {
+ final String paths = System.getProperty(ADDITONAL_BUNDLES_PATH);
+ if(paths == null) {
log.info("System property {} not set, additional bundles won't be installed",
ADDITONAL_BUNDLES_PATH);
} else {
- final List<File> toInstall = getBundlesToInstall(path);
-
+ final List<File> toInstall = new ArrayList<File>();
try {
+ // Paths can contain a comma-separated list
+ final String [] allPaths = paths.split(",");
+ for(String path : allPaths) {
+ toInstall.addAll(getBundlesToInstall(path.trim()));
+ }
+
// Install bundles, check that they are installed and start them all
bundlesInstaller.installBundles(toInstall, false);
final List<String> symbolicNames = new LinkedList<String>();