add more ordering and more tests

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2133 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 22, 2009 · e686ddb · e686ddb
1 parent 3b5f406
commit e686ddb
Show file tree

Hide file tree

Showing 12 changed files with 210 additions and 86 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java b/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
@@ -64,6 +64,7 @@ public abstract class AbstractClassBean<T> extends AbstractBean<T, Class<T>>
    private Set<FieldInjectionPoint<?>> injectableFields;
    // The initializer methods
    private Set<MethodInjectionPoint<?>> initializerMethods;
+   private Set<String> dependencies;
 
    /**
     * Constructor
@@ -122,6 +123,11 @@ protected void initType()
    {
       log.trace("Bean type specified in Java");
       this.type = getAnnotatedItem().getRawType();
+      this.dependencies = new HashSet<String>();
+      for (Class<?> clazz = type.getSuperclass(); clazz != Object.class; clazz = clazz.getSuperclass())
+      {
+         dependencies.add(clazz.getName());
+      }
    }
 
    /**
@@ -309,6 +315,12 @@ public Set<? extends MethodInjectionPoint<?>> getInitializerMethods()
    {
       return initializerMethods;
    }
+
+   // TODO maybe a better way to expose this?
+   public Set<String> getSuperclasses()
+   {
+      return dependencies;
+   }
 
    /**
     * Gets a string representation

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java b/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
@@ -452,15 +452,6 @@ else if (preDestroyMethods.size() == 1)
       }
    }
 
-   /**
-    * Initializes the bean type
-    */
-   protected void initType()
-   {
-      log.trace("Bean type specified in Java");
-      this.type = getAnnotatedItem().getRawType();
-   }
-
    /**
     * Returns the constructor
     * 

diff --git a/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java b/impl/src/main/java/org/jboss/webbeans/bootstrap/BootstrapOrderingBeanComparator.java
@@ -25,100 +25,56 @@ else if (o1 instanceof AbstractStandardBean && o2 instanceof AbstractStandardBea
       {
          return o1.getId().compareTo(o2.getId());
       }
-      else if (o1.getType().getName().startsWith("org.jboss.webbeans") && !o2.getType().getName().startsWith("org.jboss.webbeans"))
-      {
-         return -1;
-      }
-      else if (!o1.getType().getName().startsWith("org.jboss.webbeans") && o2.getType().getName().startsWith("org.jboss.webbeans"))
-      {
-         return 1;
-      }
-      else if (o1 instanceof AbstractClassBean)
+
+      if (o1 instanceof AbstractClassBean && o2 instanceof AbstractClassBean)
       {
          AbstractClassBean<?> b1 = (AbstractClassBean<?>) o1;
-         if (o2 instanceof NewBean && !(o1 instanceof NewBean))
+         AbstractClassBean<?> b2 = (AbstractClassBean<?>) o2;
+         if (b1.getSuperclasses().contains(b2.getType().getName()))
          {
-            // Always initialize new beans after class beans
-            return -1;
-         }
-         else if (o1 instanceof NewBean && o2 instanceof AbstractClassBean && !(o2 instanceof NewBean))
-         {
-            // Always initialize new beans after class beans
+            // Place o1 after it's superclass
             return 1;
          }
-         else if (o1 instanceof NewBean && !(o2 instanceof NewBean))
+         else if (b2.getSuperclasses().contains(b1.getType().getName()))
          {
-            // Always initialize new class beans after class beans but before other beans
+            // Place o1 before it's subclass o2
             return -1;
          }
-         else if (o1 instanceof NewBean && o2 instanceof NewBean)
-         {
-            return o1.getId().compareTo(o2.getId());
-         }
-         else if (o2 instanceof AbstractClassBean)
-         {
-            AbstractClassBean<?> b2 = (AbstractClassBean<?>) o2;
-            if (o1.getTypes().contains(b2.getType()))
-            {
-               return 1;
-            }
-            else if (b2.getTypes().contains(b1.getType()))
-            {
-               return -1;
-            }
-            else
-            {
-               return o1.getId().compareTo(o2.getId());
-            }
-         }
-         else if (o2 instanceof AbstractProducerBean)
-         {
-            // Producer beans are always initialized after class beans
-            return -1;
-         }
-         else
-         {
-            // Ordering doesn't matter
-            return o1.getId().compareTo(o2.getId());
-         }
       }
-      else if (o1 instanceof AbstractProducerBean)
+      else if (o2 instanceof AbstractProducerBean)
+      {
+         // Producer beans are always initialized after class beans
+         return -1;
+      }
+
+      if (o1 instanceof AbstractProducerBean)
       {
          AbstractProducerBean<?, ?> b1 = (AbstractProducerBean<?, ?>) o1;
-         if (o2 instanceof NewBean)
+         if (o2 instanceof AbstractClassBean && b1.getDeclaringBean().equals(o2))
          {
-            // Always initialize producers beans after new beans
             return 1;
          }
-         else if (o2 instanceof AbstractClassBean)
-         {
-            if (b1.getDeclaringBean().equals(o2))
-            {
-               return 1;
-            }
-            else
-            {
-               return o1.getId().compareTo(o2.getId());
-            }
-         }
-         else
-         {
-            // Ordering doesn't matter
-            return o1.getId().compareTo(o2.getId());
-         }
       }
-      else
+
+      if (o1.getType().getName().startsWith("org.jboss.webbeans") && !o2.getType().getName().startsWith("org.jboss.webbeans"))
       {
-         if (o2 instanceof AbstractClassBean || o2 instanceof AbstractProducerBean)
-         {
-            // Initialize undefined ordering after defined ordering
-            return 1;
-         }
-         else
-         {
-            return o1.getId().compareTo(o2.getId());
-         }
+         return -1;
+      }
+      else if (!o1.getType().getName().startsWith("org.jboss.webbeans") && o2.getType().getName().startsWith("org.jboss.webbeans"))
+      {
+         return 1;
+      }
+
+      if (!(o1 instanceof NewBean) && o2 instanceof NewBean)
+      {
+         return -1;
+      }
+      else if (o1 instanceof NewBean && !(o2 instanceof NewBean))
+      {
+         return 1;
       }
+
+      return o1.getId().compareTo(o2.getId());
    }
 
 }
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/BootstrapTest.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/BootstrapTest.java
@@ -0,0 +1,43 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.manager.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.webbeans.bean.ProducerMethodBean;
+import org.jboss.webbeans.bean.RIBean;
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+@Packaging(PackagingType.EAR)
+public class BootstrapTest extends AbstractWebBeansTest
+{
+
+   @Test(groups="bootstrap")
+   public void testProducerMethodBean()
+   {
+      //deployBeans(TarantulaProducer.class);
+      List<Bean<?>> beans = manager.getBeans();
+      Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+      for (Bean<?> bean : beans)
+      {
+         if (bean instanceof RIBean)
+         {
+            classes.put(((RIBean<?>) bean).getType(), bean);
+         }
+      }
+      assert classes.containsKey(TarantulaProducer.class);
+      assert classes.containsKey(Tarantula.class);
+
+      assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
+      assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
+   }
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeadlyAnimal.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeadlyAnimal.java
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+interface DeadlyAnimal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeadlySpider.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeadlySpider.java
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+interface DeadlySpider extends DeadlyAnimal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DefangedTarantula.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DefangedTarantula.java
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+class DefangedTarantula extends Tarantula
+{
+
+}
diff --git a/...s/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeployerOrderingTest.java b/...s/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/DeployerOrderingTest.java
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import javax.inject.AnnotationLiteral;
+
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.Classes;
 import org.jboss.testharness.impl.packaging.Packaging;
@@ -110,4 +112,59 @@ public void testOrgJbossWebbeansBeforeUsers()
       }
    }
 
+   @Test(groups="bootstrap")
+   public void testProducerMethodAfterDeclaringBean()
+   {
+      BeanDeployer beanDeployer = new BeanDeployer(manager);
+      beanDeployer.addClasses(Arrays.asList(TarantulaProducer.class, Tuna.class));
+      beanDeployer.createBeans();
+      int indexOfProducerDeclaringBean = 0;
+      int indexOfProducer = 0;
+      int i = 0;
+      assert beanDeployer.getBeans().size() == 5;
+      for (RIBean<?> bean : beanDeployer.getBeans())
+      {
+         if (bean.getType().equals(TarantulaProducer.class))
+         {
+            indexOfProducerDeclaringBean = i; 
+         }
+         if (bean.getType().equals(Tarantula.class) && bean.getBindings().contains(new AnnotationLiteral<Tame>() {}))
+         {
+            indexOfProducer = i;
+         }
+         i++;
+      }
+   }
+
+   @Test(groups="bootstrap")
+   public void testClassHierarchies()
+   {
+      BeanDeployer beanDeployer = new BeanDeployer(manager);
+      beanDeployer.addClasses(Arrays.asList(Spider.class, Tarantula.class, DefangedTarantula.class, Tuna.class));
+      beanDeployer.createBeans();
+      assert beanDeployer.getBeans().size() == 8;
+      int indexOfSpider = 0;
+      int indexOfTarantula = 0;
+      int indexOfDefangedTarantula = 0;
+      int i = 0;
+      for (RIBean<?> bean : beanDeployer.getBeans())
+      {
+         if (bean.getType().equals(Spider.class))
+         {
+            indexOfSpider = i; 
+         }
+         if (bean.getType().equals(Tarantula.class))
+         {
+            indexOfTarantula = i;
+         }
+         if (bean.getType().equals(DefangedTarantula.class))
+         {
+            indexOfDefangedTarantula = i;
+         }
+         i++;
+      }
+      assert indexOfDefangedTarantula > indexOfTarantula;
+      assert indexOfTarantula > indexOfSpider;
+   }
+
 }
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Spider.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Spider.java
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+class Spider implements Animal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Tame.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Tame.java
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Tame
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Tarantula.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/Tarantula.java
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+class Tarantula extends Spider implements DeadlySpider
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/TarantulaProducer.java b/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/ordering/TarantulaProducer.java
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.test.unit.bootstrap.ordering;
+
+import javax.inject.Produces;
+
+public class TarantulaProducer
+{
+
+   @Produces @Tame public Tarantula produceTameTarantula()
+   {
+      return new DefangedTarantula();
+   }
+
+}