[jboss-osgi-commits] JBoss-OSGI SVN: r96452 - in projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi: jbosgi151 and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2009-11-16 20:52:03 -0500 (Mon, 16 Nov 2009) New Revision: 96452 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java Log: shutdown framework in @AfterClass Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java 2009-11-17 01:41:20 UTC (rev 96451) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java 2009-11-17 01:52:03 UTC (rev 96452) @@ -29,6 +29,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -53,6 +54,17 @@ framework.start(); } + @AfterClass + public static void afterClass() throws Exception + { + if (framework != null) + { + framework.stop(); + framework.waitForStop(2000); + framework = null; + } + } + @Test public void testGetBundleId() { Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-17 01:41:20 UTC (rev 96451) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-17 01:52:03 UTC (rev 96452) @@ -28,6 +28,7 @@ import org.jboss.osgi.testing.OSGiTestHelper; import org.jboss.test.osgi.jbosgi151.bundleA.BeanA; import org.jboss.test.osgi.jbosgi151.bundleB.BeanB; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -71,13 +72,14 @@ framework.start(); } - @BeforeClass + @AfterClass public static void afterClass() throws Exception { if (framework != null) { framework.stop(); framework.waitForStop(2000); + framework = null; } }