[webbeans-commits] Webbeans SVN: r131 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: components and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-10-23 14:47:13 -0400 (Thu, 23 Oct 2008)
New Revision: 131

Added:
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java
Modified:
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java
Log:
Fix the test

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java	2008-10-23 18:43:32 UTC (rev 130)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java	2008-10-23 18:47:13 UTC (rev 131)
@@ -13,8 +13,8 @@
 import org.jboss.webbeans.test.components.Animal;
 import org.jboss.webbeans.test.components.FishFarm;
 import org.jboss.webbeans.test.components.Haddock;
+import org.jboss.webbeans.test.components.SeaBass;
 import org.jboss.webbeans.test.components.Tuna;
-import org.jboss.webbeans.test.components.broken.Carp;
 import org.jboss.webbeans.util.Reflections;
 import org.testng.annotations.Test;
 
@@ -48,14 +48,15 @@
    public void testMultipleApiTypeWithCurrent() throws Exception
    {
       InjectableField<Animal> animalField = new InjectableField<Animal>(FishFarm.class.getDeclaredField("animal"));
-      Bean<Carp> carpBean = new BeanImpl<Carp>(new SimpleComponentModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), super.manager), manager);
+      Bean<SeaBass> seaBassBean = new BeanImpl<SeaBass>(new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), super.manager), manager);
       Bean<Haddock> haddockBean = new BeanImpl<Haddock>(new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), super.manager), manager);
       Set<Bean<?>> beans = new HashSet<Bean<?>>();
-      beans.add(carpBean);
+      beans.add(seaBassBean);
       beans.add(haddockBean);
       Set<Bean<?>> possibleTargets = animalField.getPossibleBeans(beans);
-      assert possibleTargets.size() == 1;
-      assert possibleTargets.contains(carpBean);
+      assert possibleTargets.size() == 2;
+      assert possibleTargets.contains(seaBassBean);
+      assert possibleTargets.contains(haddockBean);
    }
    
 }

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java	2008-10-23 18:43:32 UTC (rev 130)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java	2008-10-23 18:47:13 UTC (rev 131)
@@ -1,6 +1,7 @@
 package org.jboss.webbeans.test.components;
 
 import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
+import org.jboss.webbeans.test.components.Animal;
 
 @RequestScopedAnimalStereotype
 public class Carp implements Animal

Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java (from rev 125, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java	                        (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java	2008-10-23 18:47:13 UTC (rev 131)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.components.broken;
+
+import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
+import org.jboss.webbeans.test.components.Animal;
+
+ at RequestScopedAnimalStereotype
+public class Carp implements Animal
+{
+
+}


Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain