port client proxy tests, and tidy up

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1017 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 16, 2009 · 31cba18 · 31cba18
1 parent 6919077
commit 31cba18
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
@@ -11,7 +11,9 @@
 import org.jboss.webbeans.bean.ProducerFieldBean;
 import org.jboss.webbeans.bean.ProducerMethodBean;
 import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
 import org.jboss.webbeans.tck.api.Beans;
+import org.jboss.webbeans.util.Reflections;
 
 /**
  * Implements the Beans SPI for the TCK specifically for the JBoss RI.
@@ -65,20 +67,52 @@ public boolean isEnterpriseBean(Class<?> clazz)
 
    public boolean isEntityBean(Class<?> clazz)
    {
-      // TODO Auto-generated method stub
+      if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+      {
+         for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+         {
+            if (!ejbDescriptor.isMessageDriven() && !ejbDescriptor.isSingleton() && !ejbDescriptor.isStateful() && !ejbDescriptor.isStateless())
+            {
+               return true;
+            }
+         }
+      }
       return false;
    }
 
    public boolean isStatefulBean(Class<?> clazz)
    {
-      // TODO Auto-generated method stub
+      if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+      {
+         for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+         {
+            if (ejbDescriptor.isStateful())
+            {
+               return true;
+            }
+         }
+      }
       return false;
    }
 
    public boolean isStatelessBean(Class<?> clazz)
    {
-      // TODO Auto-generated method stub
+      if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+      {
+         for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+         {
+            if (ejbDescriptor.isStateless())
+            {
+               return true;
+            }
+         }
+      }
       return false;
    }
+
+   public boolean isProxy(Object instance)
+   {
+      return Reflections.isProxy(instance);
+   }
 
 }
diff --git a/...org/jboss/webbeans/test/BoostrapTest.java → ...boss/webbeans/test/unit/BoostrapTest.java b/...org/jboss/webbeans/test/BoostrapTest.java → ...boss/webbeans/test/unit/BoostrapTest.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test;
+package org.jboss.webbeans.test.unit;
 
 import java.util.HashMap;
 import java.util.List;
@@ -10,6 +10,7 @@
 import org.jboss.webbeans.bean.EnterpriseBean;
 import org.jboss.webbeans.bean.ProducerMethodBean;
 import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.AbstractTest;
 import org.jboss.webbeans.test.beans.Elephant;
 import org.jboss.webbeans.test.beans.InitializedObserver;
 import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesApplicationContext;

diff --git a/...webbeans/test/ClassAnnotatedItemTest.java → ...ans/test/unit/ClassAnnotatedItemTest.java b/...webbeans/test/ClassAnnotatedItemTest.java → ...ans/test/unit/ClassAnnotatedItemTest.java
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test;
+package org.jboss.webbeans.test.unit;
 
 import java.lang.annotation.Annotation;
 import java.util.Iterator;