Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 12:54:25 -0500 (Thu, 04 Mar 2010)
New Revision: 101876
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java
Log:
Align runtime.shutdown(2000)
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-04
17:27:33 UTC (rev 101875)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-04
17:54:25 UTC (rev 101876)
@@ -46,10 +46,18 @@
{
OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
Framework framework = bootProvider.getFramework();
- assertNotNull("Framework not null", framework);
+ try
+ {
+ assertNotNull("Framework not null", framework);
- assertEquals("BundleId == 0", 0, framework.getBundleId());
- assertNotNull("SymbolicName not null", framework.getSymbolicName());
+ assertEquals("BundleId == 0", 0, framework.getBundleId());
+ assertNotNull("SymbolicName not null", framework.getSymbolicName());
+ }
+ finally
+ {
+ framework.stop();
+ framework.waitForStop(2000);
+ }
}
@Test
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04
17:27:33 UTC (rev 101875)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04
17:54:25 UTC (rev 101876)
@@ -66,7 +66,10 @@
public void tearDown()
{
if (runtime != null)
+ {
runtime.shutdown();
+ runtime = null;
+ }
}
@Test
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-04
17:27:33 UTC (rev 101875)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-04
17:54:25 UTC (rev 101876)
@@ -88,7 +88,7 @@
finally
{
framework.stop();
- framework.waitForStop(1000);
+ framework.waitForStop(2000);
}
}
}
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-04
17:27:33 UTC (rev 101875)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-04
17:54:25 UTC (rev 101876)
@@ -56,10 +56,10 @@
{
OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
Framework framework = bootProvider.getFramework();
- framework.start();
-
try
{
+ framework.start();
+
BundleContext sysContext = framework.getBundleContext();
Bundle bundleX =
sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleX.jar").toExternalForm());
bundleX.start();
@@ -77,7 +77,7 @@
finally
{
framework.stop();
- framework.waitForStop(1000);
+ framework.waitForStop(2000);
}
}
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-04
17:27:33 UTC (rev 101875)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-04
17:54:25 UTC (rev 101876)
@@ -92,7 +92,7 @@
finally
{
framework.stop();
- framework.waitForStop(5000);
+ framework.waitForStop(2000);
}
}
@@ -121,7 +121,7 @@
finally
{
framework.stop();
- framework.waitForStop(5000);
+ framework.waitForStop(2000);
}
}
}
\ No newline at end of file