[jboss-osgi-commits] JBoss-OSGI SVN: r97452 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service.

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

Author: alesj
Date: 2009-12-04 07:06:19 -0500 (Fri, 04 Dec 2009)
New Revision: 97452

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
Log:
Assert on invoke.

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java	2009-12-04 11:52:01 UTC (rev 97451)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java	2009-12-04 12:06:19 UTC (rev 97452)
@@ -105,8 +105,9 @@
       }
    }
 
-   private static Object invoke(Object target, String getter) throws Throwable
+   private static Object invoke(Object target, String getter, String name) throws Throwable
    {
+      assertNotNull("Target" + name + " is not null", target);
       Class<?> clazz = target.getClass();
       Method m = clazz.getDeclaredMethod(getter);
       return m.invoke(target);
@@ -138,7 +139,7 @@
                checkComplete();
 
                Object c = getBean("C");
-               assertSame(a, invoke(c, "getA"));
+               assertSame(a, invoke(c, "getA", "C"));
 
                ServiceReference ref1 = bundleContext1.getServiceReference(A.class.getName());
                assertUsingBundles(ref1, LazyBundle.getBundle(getDeploymentUnit(bean)));
@@ -197,7 +198,7 @@
                checkComplete();
 
                Object c = getBean("C");
-               assertSame(a, invoke(c, "getA"));
+               assertSame(a, invoke(c, "getA", "C"));
 
                ServiceReference ref1 = bundleContext1.getServiceReference(A.class.getName());
                assertUsingBundles(ref1, LazyBundle.getBundle(getDeploymentUnit(bean)));
@@ -261,15 +262,13 @@
                   checkComplete();
 
                   Object c1 = getBean("C1");
-                  assertNotNull("Bean C1 not null", c1);
-                  Object a1 = invoke(c1, "getA");
-                  assertNotNull("Bean A not null", a1);
-                  Object msg1 = invoke(a1, "getMsg");
+                  Object a1 = invoke(c1, "getA", "C1");
+                  Object msg1 = invoke(a1, "getMsg", "A1");
                   assertEquals(msg1, getBundle(bean1).getSymbolicName());
 
                   Object c2 = getBean("C2");
-                  Object a2 = invoke(c2, "getA");
-                  Object msg2 = invoke(a2, "getMsg");
+                  Object a2 = invoke(c2, "getA", "C2");
+                  Object msg2 = invoke(a2, "getMsg", "A2");
                   assertEquals(msg2, getBundle(bean2).getSymbolicName());
                }
                finally