You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/02/23 20:35:55 UTC
[sling-org-apache-sling-servlets-resolver] 01/02: add Pax Exam
vmOption conditionally
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
commit b95371d9e7650b212d11ff7f83e58403aaa32481
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 23 18:46:33 2020 +0100
add Pax Exam vmOption conditionally
---
.../sling/servlets/resolver/it/ServletResolverTestSupport.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index 35e6c96..e40ca34 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -48,6 +48,7 @@ import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
@@ -74,14 +75,15 @@ public class ServletResolverTestSupport extends TestSupport {
@Configuration
public Option[] configuration() {
final String vmOpt = System.getProperty("pax.vm.options");
- assertNotNull("Expecting non-null VM options", vmOpt);
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.resourceresolver");
// adding Scripting Core to POM breaks ScriptSelection2Test
versionResolver.setVersion("org.apache.sling", "org.apache.sling.scripting.core", "2.2.0-SNAPSHOT");
return options(
composite(
- vmOption(vmOpt),
+ when(vmOpt != null).useOptions(
+ vmOption(vmOpt)
+ ),
baseConfiguration(),
slingQuickstart(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.12"), // new Sling API dependency