[jboss-osgi-commits] JBoss-OSGI SVN: r94016 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-24 22:06:40 -0400 (Thu, 24 Sep 2009)
New Revision: 94016

Modified:
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
Log:
[JBCL-116] Potential deadlock in ClassLoaderManager
Remove assumptions

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-25 02:05:22 UTC (rev 94015)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-09-25 02:06:40 UTC (rev 94016)
@@ -25,7 +25,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -50,7 +49,6 @@
 public class HttpServiceTestCase
 {
    private static OSGiRuntime runtime;
-   private static boolean httpServiceAvailable;
 
    @BeforeClass
    public static void setUpClass() throws Exception
@@ -68,7 +66,6 @@
       }
 
       assertNotNull("HttpService not null", sref);
-      httpServiceAvailable = true;
 
       OSGiBundle bundle = runtime.installBundle("example-http.jar");
       bundle.start();
@@ -83,8 +80,6 @@
    @Test
    public void testServletAccess() throws Exception
    {
-      assumeTrue(httpServiceAvailable);
-
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=plain");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("Hello from Servlet", br.readLine());
@@ -93,8 +88,6 @@
    @Test
    public void testServletInitProps() throws Exception
    {
-      assumeTrue(httpServiceAvailable);
-
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=initProp");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("initProp=SomeValue", br.readLine());
@@ -103,8 +96,6 @@
    @Test
    public void testServletBundleContext() throws Exception
    {
-      assumeTrue(httpServiceAvailable);
-
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=context");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("example-http", br.readLine());
@@ -113,8 +104,6 @@
    @Test
    public void testServletStartLevel() throws Exception
    {
-      assumeTrue(httpServiceAvailable);
-
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/servlet?test=startLevel");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("startLevel=1", br.readLine());
@@ -123,8 +112,6 @@
    @Test
    public void testResourceAccess() throws Exception
    {
-      assumeTrue(httpServiceAvailable);
-
       URL url = new URL("http://" + runtime.getServerHost() + ":8090/file/message.txt");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       assertEquals("Hello from Resource", br.readLine());