[weld-commits] Weld SVN: r5608 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/byname and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-22 11:53:22 -0500 (Fri, 22 Jan 2010)
New Revision: 5608

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
Log:
port CDITCK-91 to trunk

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-01-22 16:52:32 UTC (rev 5607)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-01-22 16:53:22 UTC (rev 5608)
@@ -118,7 +118,7 @@
          }
       }
       
-      assert bean != null;
+      assert bean == null;
       assert specializedBean != null;
       assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class);
    }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-01-22 16:52:32 UTC (rev 5607)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-01-22 16:53:22 UTC (rev 5608)
@@ -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");