[weld-commits] Weld SVN: r5520 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname and 3 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-19 12:30:30 -0500 (Tue, 19 Jan 2010)
New Revision: 5520

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
   core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java
   core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
   core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
CDITCK-91

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-01-19 17:29:12 UTC (rev 5519)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-01-19 17:30:30 UTC (rev 5520)
@@ -102,7 +102,7 @@
          }
       }
       
-      assert bean != null;
+      assert bean == null;
       assert specializedBean != null;
       assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class);
    }

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-01-19 17:29:12 UTC (rev 5519)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-01-19 17:30:30 UTC (rev 5520)
@@ -44,7 +44,7 @@
    {
       // Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice
       Set<Bean<?>> beans = getCurrentManager().getBeans("whitefish");
-      assert beans.size() == 2;
+      assert beans.size() == 1;
       assert getCurrentManager().resolve(beans).getTypes().contains(AlaskaPlaice.class);
       // Both Salmon and Sole are named "fish" - Sole is an enabled policy
       beans = getCurrentManager().getBeans("fish");

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java	2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java	2010-01-19 17:30:30 UTC (rev 5520)
@@ -347,7 +347,7 @@
 
       for (String name : namedAccessibleBeans.keySet())
       {
-         Set<Bean<?>> resolvedBeans = beanManager.getBeanResolver().resolve(namedAccessibleBeans.get(name));
+         Set<Bean<?>> resolvedBeans = beanManager.getBeanResolver().resolve(Beans.removeDisabledAndSpecializedBeans(namedAccessibleBeans.get(name), beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), beanManager.getSpecializedBeans()));
          if (resolvedBeans.size() > 1)
          {
             throw new DeploymentException(AMBIGUOUS_EL_NAME, name, resolvedBeans);

Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java	2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java	2010-01-19 17:30:30 UTC (rev 5520)
@@ -58,7 +58,7 @@
                matchedBeans.add(bean);
             }
          }
-         return Beans.retainEnabledAlternatives(matchedBeans, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes());
+         return Beans.removeDisabledAndSpecializedBeans(matchedBeans, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), beanManager.getSpecializedBeans());
       }
       
    }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java	2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java	2010-01-19 17:30:30 UTC (rev 5520)
@@ -68,7 +68,7 @@
             
             for (Bean<?> bean : from)
             {
-               if (alternativePresent ? bean.isAlternative() : true && !Beans.isSpecialized(bean, from, beanManager.getSpecializedBeans()))
+               if (alternativePresent ? bean.isAlternative() : true)
                {
                   disambiguatedBeans.add(bean);
                }
@@ -112,7 +112,7 @@
    @Override
    protected Set<T> filterResult(Set<T> matched)
    {
-      return Beans.retainEnabledAlternatives(matched, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes());
+      return Beans.removeDisabledAndSpecializedBeans(matched, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), getBeanManager().getSpecializedBeans());
    }
 
    @Override

Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml	2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml	2010-01-19 17:30:30 UTC (rev 5520)
@@ -112,7 +112,17 @@
                <exclude name="testProducerPoliciesOnClass" />
                <exclude name="testProducerPoliciesOnMethodAndField" />
               </methods>
-         ></class>
+         </class>
+         <class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
+            <methods>
+               <exclude name="testSpecializedBeanExtendsManagedBean" />
+            </methods>
+         </class>
+         <class name="org.jboss.jsr299.tck.tests.lookup.byname.ResolutionByNameTest">
+            <methods>
+               <exclude name="testAmbiguousELNamesResolved" />
+            </methods>
+         </class>
       </classes>
    </test>