svn commit: r1843602 - /felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java

[cs...@apache.org]

Author: cschneider
Date: Thu Oct 11 20:48:36 2018
New Revision: 1843602

URL: http://svn.apache.org/viewvc?rev=1843602&view=rev
Log:
Add local repo config

Modified:
    felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java

Modified: felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java?rev=1843602&r1=1843601&r2=1843602&view=diff
==============================================================================
--- felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java (original)
+++ felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java Thu Oct 11 20:48:36 2018
@@ -21,6 +21,8 @@ package org.apache.felix.systemready.osg
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
 
 import java.util.Optional;
@@ -38,6 +40,7 @@ import org.apache.felix.systemready.impl
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.cm.ConfigurationAdminOptions;
+import org.ops4j.pax.exam.options.OptionalCompositeOption;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.runtime.ServiceComponentRuntime;
 import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
@@ -55,9 +58,11 @@ public class BaseTest {
     @Inject
     public ServiceComponentRuntime scr;
 
+    
 
     public Option baseConfiguration() {
         return CoreOptions.composite(
+        		
                 systemProperty("pax.exam.invoker").value("junit"),
                 systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
                 systemProperty("logback.configurationFile")
@@ -79,6 +84,15 @@ public class BaseTest {
         );
     }
     
+    protected static OptionalCompositeOption localRepo() {
+        String localRepo = System.getProperty("maven.repo.local");
+        if (localRepo == null) {
+            localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+        }
+        return when(localRepo != null)
+            .useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo));
+    }
+    
     public Option servicesCheckConfig(StateType type, String... services) {
         return ConfigurationAdminOptions.factoryConfiguration(ServicesCheck.PID)
                 .put("services.list", services)