[jboss-osgi-commits] JBoss-OSGI SVN: r87487 - in projects/jboss-osgi/trunk: testsuite/functional and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-17 06:39:42 -0400 (Fri, 17 Apr 2009) New Revision: 87487 Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java Log: [FELIX-1040] Done Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-17 10:38:56 UTC (rev 87486) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-17 10:39:42 UTC (rev 87487) @@ -173,7 +173,7 @@ try { framework.stop(); - framework.waitForStop(500); + framework.waitForStop(5000); log.debug("SystemBundle STOPPED"); } catch (BundleException ex) Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-17 10:38:56 UTC (rev 87486) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-17 10:39:42 UTC (rev 87487) @@ -293,8 +293,6 @@ <!-- Exclude tests that require remote access --> <exclude>org/jboss/test/osgi/deployer/**</exclude> <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> - <!-- [FELIX-1040] Bundle may start with unresolved packages --> - <exclude>org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java</exclude> </excludes> </configuration> </plugin> @@ -327,8 +325,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- [FELIX-1040] Bundle may start with unresolved packages --> - <exclude>org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java 2009-04-17 10:38:56 UTC (rev 87486) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/FELIX1040TestCase.java 2009-04-17 10:39:42 UTC (rev 87487) @@ -42,30 +42,41 @@ public void testVerifyUnresolved() throws Exception { OSGiFramework fwOne = createBootstrapProvider().getFramework(); - BundleContext ctxOne = fwOne.getSystemBundleContext(); - - Bundle bundleA = ctxOne.installBundle(getTestArchiveURL("jbosgi37-bundleA.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - - bundleA.start(); + try + { + BundleContext ctxOne = fwOne.getSystemBundleContext(); + + Bundle bundleA = ctxOne.installBundle(getTestArchiveURL("jbosgi37-bundleA.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); + + bundleA.start(); + } + finally + { + fwOne.stop(); + } - // Stop the framework - fwOne.stop(); - OSGiFramework fwTwo = createBootstrapProvider().getFramework(); - BundleContext ctxTwo = fwTwo.getSystemBundleContext(); - - Bundle bundleB = ctxTwo.installBundle(getTestArchiveURL("jbosgi39-bundleB.jar").toExternalForm()); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleA.getState()); - try { - bundleB.start(); - fail("Unresolved constraint expected"); + BundleContext ctxTwo = fwTwo.getSystemBundleContext(); + + Bundle bundleB = ctxTwo.installBundle(getTestArchiveURL("jbosgi39-bundleB.jar").toExternalForm()); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + + try + { + bundleB.start(); + fail("Unresolved constraint expected"); + } + catch (BundleException ex) + { + // expected + } } - catch (BundleException ex) + finally { - // expected + fwTwo.stop(); } } } \ No newline at end of file