[webbeans-commits] Webbeans SVN: r1093 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit: implementation and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-19 16:14:14 -0500 (Mon, 19 Jan 2009)
New Revision: 1093

Modified:
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
Log:
utility methods

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java	2009-01-19 20:50:53 UTC (rev 1092)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java	2009-01-19 21:14:14 UTC (rev 1093)
@@ -1,30 +1,19 @@
 package org.jboss.webbeans.test.unit;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
 import javax.webbeans.Production;
 import javax.webbeans.Standard;
 
-import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.bean.AbstractClassBean;
-import org.jboss.webbeans.bean.AbstractProducerBean;
 import org.jboss.webbeans.bean.EnterpriseBean;
-import org.jboss.webbeans.bean.ProducerFieldBean;
-import org.jboss.webbeans.bean.ProducerMethodBean;
-import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.bean.NewEnterpriseBean;
 import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.mock.MockBootstrap;
 import org.jboss.webbeans.test.mock.MockEjbDescriptor;
+import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
 import org.testng.annotations.BeforeMethod;
 
 public class AbstractTest
@@ -75,111 +64,29 @@
       manager.setEnabledDeploymentTypes(getEnabledDeploymentTypes());
    }
 
-   private boolean hasField(Class<?> clazz, String name)
-   {
-      try
-      {
-         Field field = clazz.getDeclaredField(name);
-      }
-      catch (NoSuchFieldException e)
-      {
-         return false;
-      }
-      return true;
-   }
-   
-   private Method getMethod(Class<?> clazz, String name)
-   {
-      for (Method method : clazz.getDeclaredMethods())
-      {
-         if (method.getName().equals(name))
-         {
-            return method;
-         }
-      }
-      return null;
-   }
-   
-   protected AbstractProducerBean<?, ?> registerProducerBean(Class<?> producerBeanClass, String fieldOrMethodName, Class<?> productClass)
-   {
-      SimpleBean<?> producerContainerBean = SimpleBean.of(producerBeanClass, manager);
-      manager.addBean(producerContainerBean);
-      AbstractProducerBean<?, ?> producerBean = null;
-      try
-      {
-         if (hasField(producerBeanClass, fieldOrMethodName))
-         {
-            Field producerField = producerBeanClass.getDeclaredField(fieldOrMethodName);
-            producerBean = ProducerFieldBean.of(producerField, producerContainerBean, manager);
-         }
-         else
-         {
-            Method producerMethod = getMethod(producerBeanClass, fieldOrMethodName);
-            producerBean = ProducerMethodBean.of(producerMethod, producerContainerBean, manager);
-         }
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException("Could not initialize producer bean", e);
-      }
-      manager.addBean(producerBean);
-      return producerBean;
-   }
-   
-   
-   protected <T> AbstractClassBean<T> registerBean(Class<T> clazz)
-   {
-      AbstractClassBean<T> bean = null;
-      if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
-      {
-         bean = EnterpriseBean.of(clazz, manager);
-      }
-      else
-      {
-         bean = SimpleBean.of(clazz, manager);
-      }
-      CurrentManager.rootManager().addBean(bean);
-      return bean;
-   }
-
-   protected void registerBeans(Class<?>[] classes)
-   {
-      for (Class<?> clazz : classes)
-      {
-         registerBean(clazz);
-      }
-   }
-
-   @SuppressWarnings("unchecked")
    protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
    {
       return getDefaultDeploymentTypes();
    }
    
+   @SuppressWarnings("unchecked")
    protected final List<Class<? extends Annotation>> getDefaultDeploymentTypes()
    {
       return Arrays.asList(Standard.class, Production.class);
    }
-
-   protected <T> void addToEjbCache(Class<T> clazz)
+   
+   protected <T> EnterpriseBean<T> createEnterpriseBean(Class<T> clazz)
    {
       manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz));
+      return EnterpriseBean.of(clazz, manager);
    }
-
-   protected byte[] serialize(Object instance) throws IOException
+   
+   protected <T> NewEnterpriseBean<T> createNewEnterpriseBean(Class<T> clazz)
    {
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      ObjectOutputStream out = new ObjectOutputStream(bytes);
-      out.writeObject(instance);
-      return bytes.toByteArray();
+      manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz));
+      return NewEnterpriseBean.of(clazz, manager);
    }
 
-   protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
-   {
-      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
-      return in.readObject();
-   }
-
    protected static void activateDependentContext()
    {
       DependentContext.INSTANCE.setActive(true);
@@ -189,4 +96,12 @@
    {
       DependentContext.INSTANCE.setActive(false);
    }
+   
+   protected ManagerImpl deploy(Class<?>... classes)
+   {
+      MockBootstrap bootstrap = new MockBootstrap();
+      bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
+      bootstrap.boot();
+      return bootstrap.getManager();
+   }
 }

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java	2009-01-19 20:50:53 UTC (rev 1092)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java	2009-01-19 21:14:14 UTC (rev 1093)
@@ -18,10 +18,9 @@
    
    @BeforeMethod
    public void initNewBean() {
-      addToEjbCache(WrappedEnterpriseBean.class);
-      wrappedEnterpriseBean = EnterpriseBean.of(WrappedEnterpriseBean.class, manager);
+      wrappedEnterpriseBean = createEnterpriseBean(WrappedEnterpriseBean.class);
       manager.addBean(wrappedEnterpriseBean);
-      newEnterpriseBean = NewEnterpriseBean.of(WrappedEnterpriseBean.class, manager);
+      newEnterpriseBean = createNewEnterpriseBean(WrappedEnterpriseBean.class);
       manager.addBean(newEnterpriseBean);
    }