svn commit: r1843860 - /webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java

[ve...@apache.org]

Author: veithen
Date: Sun Oct 14 19:41:48 2018
New Revision: 1843860

URL: http://svn.apache.org/viewvc?rev=1843860&view=rev
Log:
Fix non-deterministic failures in osgi-tests caused by Pax Exam setting required system properties.

Modified:
    webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java

Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java?rev=1843860&r1=1843859&r2=1843860&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/Utils.java Sun Oct 14 19:41:48 2018
@@ -18,21 +18,19 @@
  */
 package org.apache.axiom.test;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import org.apache.felix.framework.cache.BundleCache;
 import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.nat.internal.NativeTestContainer;
 import org.ops4j.pax.exam.options.FrameworkPropertyOption;
-import org.osgi.framework.BundleException;
+import org.ops4j.pax.exam.spi.DefaultExamSystem;
 import org.osgi.framework.Constants;
-import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
 
 public class Utils {
@@ -40,17 +38,15 @@ public class Utils {
     
     private synchronized static String[] getDefaultSystemPackages() {
         if (defaultSystemPackages == null) {
-            Map<String,String> configuration = new HashMap<>();
-            configuration.put(BundleCache.CACHE_ROOTDIR_PROP, "target");
-            Framework framework = ServiceLoader.load(FrameworkFactory.class).iterator().next().newFramework(configuration);
             try {
-                framework.start();
+                NativeTestContainer testContainer = new NativeTestContainer(DefaultExamSystem.create(null), ServiceLoader.load(FrameworkFactory.class).iterator().next());
+                testContainer.start();
                 try {
-                    defaultSystemPackages = framework.getBundleContext().getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES).split("\\s*,\\s*");
+                    defaultSystemPackages = testContainer.getSystemBundle().getBundleContext().getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES).split("\\s*,\\s*");
                 } finally {
-                    framework.stop();
+                    testContainer.stop();
                 }
-            } catch (BundleException ex) {
+            } catch (IOException ex) {
                 throw new RuntimeException(ex);
             }
         }