[jboss-cvs] JBossAS SVN: r85285 - in projects/jboss-osgi/trunk/testsuite: src/test/java/org/jboss/test/osgi/jbosgi39 and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-03-05 02:57:17 -0500 (Thu, 05 Mar 2009)
New Revision: 85285

Modified:
   projects/jboss-osgi/trunk/testsuite/pom.xml
   projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39EmbeddedTestCase.java
Log:
[JBOSGI-39] depends on https://issues.apache.org/jira/browse/FELIX-972

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-03-05 07:34:07 UTC (rev 85284)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-03-05 07:57:17 UTC (rev 85285)
@@ -121,6 +121,8 @@
                 <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
                 <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
                 <exclude>org/jboss/test/osgi/jbosgi36/junit/*TestCase.java</exclude>
+                <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
+                <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -157,7 +159,7 @@
                 <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager -->
                 <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude>
                 <exclude>org/jboss/test/osgi/service/http/junit/EndpointServiceTestCase.java</exclude>
-                <!-- [JBOSGI-39] Bundle undeploy does not clean up properly -->
+                <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
                 <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
               </excludes>
             </configuration>

Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39EmbeddedTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39EmbeddedTestCase.java	2009-03-05 07:34:07 UTC (rev 85284)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39EmbeddedTestCase.java	2009-03-05 07:57:17 UTC (rev 85285)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
 import org.jboss.osgi.spi.framework.OSGiFramework;
 import org.jboss.osgi.spi.junit.IntegrationTest;
 import org.osgi.framework.Bundle;
@@ -44,6 +44,17 @@
  */
 public class OSGI39EmbeddedTestCase extends IntegrationTest
 {
+   static OSGiBootstrapProvider bootProvider;
+   
+   @Override
+   protected OSGiBootstrapProvider getBootstrapProvider()
+   {
+      if (bootProvider == null)
+         bootProvider = createBootstrapProvider();
+      
+      return bootProvider;
+   }
+
    public void testFirstRun() throws Exception
    {
       installBBeforeX();
@@ -56,7 +67,7 @@
 
    private void installBBeforeX() throws Exception
    {
-      OSGiFramework framework = OSGiBootstrap.getBootstrapProvider().getFramework();
+      OSGiFramework framework = getBootstrapProvider().getFramework();
       BundleContext sysContext = framework.getSystemBundleContext();
       
       Bundle bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi38-bundleB.jar").toExternalForm());