commit b5a2cd4d2f714ab589959ab139af1659de5febf0
author Oliver Lietz <olli@apache.org> Wed Jun 23 11:59:54 2021 +0200
committer Oliver Lietz <olli@apache.org> Wed Jun 23 11:59:54 2021 +0200
tree b774a0ee4a18f67dbc569c5816d5152dbc62efb3
parent bf2a9c0fb257fabd626f97f3a9634d493e11a7dc

SLING-3017 Improve Karaf integration tests

enable JaCoCo for integration tests

src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index c474811..c390525 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.Dictionary;
+import java.util.Objects;
 import java.util.Properties;
 
 import javax.inject.Inject;
@@ -29,6 +30,8 @@
 import org.apache.karaf.features.BootFinished;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
+import org.ops4j.pax.exam.options.OptionalCompositeOption;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.ops4j.pax.exam.util.Filter;
 import org.ops4j.pax.exam.util.PathUtils;
 import org.osgi.framework.Bundle;
@@ -42,6 +45,7 @@
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
@@ -152,7 +156,8 @@
             addSlingFeatures("sling-configs"),
             mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject(),
             mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").versionAsInProject(),
-            karafTestSupportBundle()
+            karafTestSupportBundle(),
+            jacoco()
         );
         if (JavaVersionUtil.getMajorVersion() >= 9) {
             return combine(options, java9plus());
@@ -161,6 +166,12 @@
         }
     }
 
+    protected OptionalCompositeOption jacoco() {
+        final String jacocoCommand = System.getProperty("jacoco.command");
+        final VMOption option = Objects.nonNull(jacocoCommand) && !jacocoCommand.trim().isEmpty() ? vmOption(jacocoCommand) : null;
+        return when(Objects.nonNull(option)).useOptions(option);
+    }
+
     protected Option[] java9plus() {
         return options(
             vmOption("--add-reads=java.xml=java.logging"),