[jboss-osgi-commits] JBoss-OSGI SVN: r102223 - projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing.

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

Author: thomas.diesler at jboss.com
Date: 2010-03-10 08:24:47 -0500 (Wed, 10 Mar 2010)
New Revision: 102223

Modified:
   projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
   projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
Log:
Add more osgi test helper methods

Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java	2010-03-10 13:00:44 UTC (rev 102222)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java	2010-03-10 13:24:47 UTC (rev 102223)
@@ -223,10 +223,18 @@
    }
 
    /**
-    * Delegates to {@link OSGiTestHelper#assertBundleLoadClass(Bundle, String, boolean)}
+    * Delegates to {@link OSGiTestHelper#assertLoadClass(Bundle, String)}
     */
-   public void assertBundleLoadClass(Bundle bundle, String className, boolean success)
+   public Class<?> assertLoadClass(Bundle bundle, String className)
    {
-      getTestHelper().assertBundleLoadClass(bundle, className, success);
+      return getTestHelper().assertLoadClass(bundle, className);
    }
+   
+   /**
+    * Delegates to {@link OSGiTestHelper#assertLoadClassFail(Bundle, String)}
+    */
+   public void assertLoadClassFail(Bundle bundle, String className)
+   {
+      getTestHelper().assertLoadClassFail(bundle, className);
+   }
 }

Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java	2010-03-10 13:00:44 UTC (rev 102222)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java	2010-03-10 13:24:47 UTC (rev 102223)
@@ -187,7 +187,7 @@
    {
       String port = System.getProperty("jndi.server.port", "1099");
       Integer jndiPort = new Integer(port);
-      
+
       Hashtable env = new Hashtable();
       env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
       env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
@@ -212,7 +212,7 @@
       String framework = System.getProperty("framework");
       if (framework == null || framework.length() == 0 || framework.equals("${framework}"))
          framework = "jbossmc";
-      
+
       return framework;
    }
 
@@ -231,7 +231,7 @@
             URL url = getClass().getResource(res);
             if (url == null)
                throw new IllegalArgumentException("Cannot load resource: " + res);
-            
+
             final VirtualFile file = AbstractVFS.getRoot(url);
             if (file.isDirectory())
             {
@@ -245,25 +245,25 @@
       }
       if (packages != null)
       {
-         for(Class<?> clazz : packages)
+         for (Class<?> clazz : packages)
          {
             URL url = clazz.getResource("/");
             VirtualFile base = AbstractVFS.getRoot(url);
-            
+
             String path = clazz.getName().replace('.', '/');
             path = path.substring(0, path.lastIndexOf("/"));
-            
+
             VirtualFile classes = base.getChild(path);
             addResources(archive, base, classes);
          }
       }
-      
+
       // Convert archive to file URL 
       ZipExporter exporter = archive.as(ZipExporter.class);
       File target = File.createTempFile("archive_", ".jar");
       exporter.exportZip(target, true);
       target.deleteOnExit();
-      
+
       return AbstractVFS.getRoot(target.toURI().toURL());
    }
 
@@ -274,10 +274,10 @@
       {
          if (child.isDirectory())
             continue;
-         
+
          String path = child.getPathName();
          path = path.substring(basepath.length());
-         
+
          addResource(archive, path, child);
       }
    }
@@ -307,28 +307,32 @@
       String wasstr = ConstantsHelper.bundleState(wasState);
       assertEquals("Bundle " + expstr, expstr, wasstr);
    }
-   
-   public void assertBundleLoadClass(Bundle bundle, String className, boolean success)
+
+   public Class<?> assertLoadClass(Bundle bundle, String className)
    {
-      String message = bundle.getSymbolicName() + " loads " + className;
-      
-      Class<?> clazz;
       try
       {
-         clazz = bundle.loadClass(className);
-         if (success)
-         {
-            assertEquals(message, className, clazz.getName());
-         }
-         else
-         {
-            fail("ClassNotFoundException expected for: " + message + "\nLoaded from " + clazz.getClassLoader());
-         }
+         return bundle.loadClass(className);
       }
       catch (ClassNotFoundException ex)
       {
-         if (success)
-            fail("Unexpected ClassNotFoundException for: " + message);
+         String message = bundle.getSymbolicName() + " loads " + className;
+         fail("Unexpected ClassNotFoundException for: " + message);
+         return null;
       }
    }
+
+   public void assertLoadClassFail(Bundle bundle, String className)
+   {
+      try
+      {
+         Class<?> clazz = bundle.loadClass(className);
+         String message = bundle.getSymbolicName() + " loads " + className;
+         fail("ClassNotFoundException expected for: " + message + "\nLoaded from " + clazz.getClassLoader());
+      }
+      catch (ClassNotFoundException ex)
+      {
+         // expected
+      }
+   }
 }