[jboss-cvs] JBossAS SVN: r94466 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-07 11:25:24 -0400 (Wed, 07 Oct 2009)
New Revision: 94466

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java
Log:
Cleanup BundleException handling

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java	2009-10-07 15:10:11 UTC (rev 94465)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/ExportImportPackageUnitTestCase.java	2009-10-07 15:25:24 UTC (rev 94466)
@@ -21,11 +21,11 @@
 */
 package org.jboss.test.osgi.classloader.test;
 
-import org.jboss.deployers.client.spi.IncompleteDeploymentException;
 import org.jboss.test.osgi.OSGiTestCase;
 import org.jboss.test.osgi.classloader.support.a.A;
 import org.jboss.test.osgi.classloader.support.b.B;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
 
 /**
  * ExportImportUnitTestCase.
@@ -106,9 +106,9 @@
             bundle2.start();
             fail("Should not be here!");
          }
-         catch (Throwable t)
+         catch (BundleException ex)
          {
-            checkDeepThrowable(IncompleteDeploymentException.class, t);
+            // expected
          }
          finally
          {
@@ -138,7 +138,7 @@
             bundleB.start();
             fail("Expected to fail due to unresolved import");
          }
-         catch (Exception e)
+         catch (BundleException ex)
          {
             // expected
          }
@@ -215,9 +215,9 @@
             bundle2.start();
             fail("Should not be here!");
          }
-         catch (Throwable t)
+         catch (BundleException ex)
          {
-            checkDeepThrowable(IncompleteDeploymentException.class, t);
+            // expected
          }
          finally
          {
@@ -353,9 +353,9 @@
                bundle2.start();
                fail("Should not be here!");
             }
-            catch (Throwable t)
+            catch (BundleException ex)
             {
-               checkDeepThrowable(IncompleteDeploymentException.class, t);
+               // expected
             }
             finally
             {
@@ -426,9 +426,9 @@
                bundle2.start();
                fail("Should not be here!");
             }
-            catch (Throwable t)
+            catch (BundleException ex)
             {
-               checkDeepThrowable(IncompleteDeploymentException.class, t);
+               // expected
             }
             finally
             {
@@ -499,9 +499,9 @@
                bundle2.start();
                fail("Should not be here!");
             }
-            catch (Throwable t)
+            catch (BundleException ex)
             {
-               checkDeepThrowable(IncompleteDeploymentException.class, t);
+               // expected
             }
             finally
             {

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java	2009-10-07 15:10:11 UTC (rev 94465)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java	2009-10-07 15:25:24 UTC (rev 94466)
@@ -26,6 +26,7 @@
 import org.jboss.test.osgi.classloader.support.a.A;
 import org.jboss.test.osgi.classloader.support.b.B;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
 
 /**
  * RequireBundleUnitTestCase.
@@ -79,9 +80,9 @@
             bundle2.start();
             fail("Should not be here!");
          }
-         catch (Throwable t)
+         catch (BundleException ex)
          {
-            checkDeepThrowable(IncompleteDeploymentException.class, t);
+            // expected
          }
          finally
          {