[jboss-cvs] JBossAS SVN: r97453 - in projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi: service and 1 other directories.

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

Author: alesj
Date: 2009-12-04 07:17:22 -0500 (Fri, 04 Dec 2009)
New Revision: 97453

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/DeployersTest.java
   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/support/d/D.java
Log:
Hack the test with reflection. TODO - find real fix.

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/DeployersTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/DeployersTest.java	2009-12-04 12:06:19 UTC (rev 97452)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/DeployersTest.java	2009-12-04 12:17:22 UTC (rev 97453)
@@ -95,7 +95,8 @@
    protected Deployment addBean(String name, Class<?> beanClass, BeanMetaData bmd, Class<?> ... references) throws Exception
    {
       AssembledDirectory dir = createAssembledDirectory(name, "");
-      addPackage(dir, beanClass);
+      if (beanClass != null)
+         addPackage(dir, beanClass);
       if (references != null)
       {
          for (Class<?> reference : references)

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 12:06:19 UTC (rev 97452)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java	2009-12-04 12:17:22 UTC (rev 97453)
@@ -107,7 +107,7 @@
 
    private static Object invoke(Object target, String getter, String name) throws Throwable
    {
-      assertNotNull("Target" + name + " is not null", target);
+      assertNotNull("Target " + name + " is not null", target);
       Class<?> clazz = target.getClass();
       Method m = clazz.getDeclaredMethod(getter);
       return m.invoke(target);
@@ -240,7 +240,7 @@
          builder = BeanMetaDataBuilder.createBuilder("C2", C.class.getName());
          builder.addPropertyMetaData("a", builder.createInject("A"));
          bmd = builder.getBeanMetaData();
-         Deployment bean2 = addBean("beanA2", C.class, bmd, A.class, D.class);
+         Deployment bean2 = addBean("beanA2", null, bmd);
          try
          {
             Bundle bundle1 = assembleBundle("simple2", "/bundles/service/service-bundle4");

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/d/D.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/d/D.java	2009-12-04 12:06:19 UTC (rev 97452)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/support/d/D.java	2009-12-04 12:17:22 UTC (rev 97453)
@@ -21,6 +21,8 @@
  */
 package org.jboss.test.osgi.service.support.d;
 
+import java.lang.reflect.Method;
+
 import org.jboss.test.osgi.service.support.a.A;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceFactory;
@@ -31,11 +33,27 @@
  */
 public class D implements ServiceFactory
 {
+   private static Object invoke(Object target, String getter)
+   {
+      try
+      {
+         Class<?> clazz = target.getClass();
+         Method m = clazz.getDeclaredMethod(getter);
+         return m.invoke(target);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
    public Object getService(Bundle bundle, ServiceRegistration registration)
    {
       A a = new A();
       // TODO -- why this doesn't work? java.lang.NoClassDefFoundError: org/osgi/framework/Bundle
-      a.msg = bundle.getSymbolicName();
+      // a.msg = bundle.getSymbolicName();
+      // TODO - but this does ...
+      a.msg = invoke(bundle, "getSymbolicName").toString();
       return a;
    }