Author: pete.muir(a)jboss.org Date: 2009-08-14 17:17:44 -0400 (Fri, 14 Aug 2009) New Revision: 3498 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java Log: Fix test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-08-14 21:12:44 UTC (rev 3497) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-08-14 21:17:44 UTC (rev 3498) @@ -34,21 +34,21 @@ public class ResolutionByNameTest extends AbstractJSR299Test { - @Test(groups = { "resolution" , "ri-broken"}) + @Test(groups = { "resolution"}) @SpecAssertions({ @SpecAssertion(section = "5.4.1", id = "c"), @SpecAssertion(section = "11.3.5", id = "aa"), @SpecAssertion(section = "11.3.5", id = "b") }) - // WBRI-331 public void testAmbiguousELNamesResolved() throws Exception { // Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice Set<Bean<?>> beans = getCurrentManager().getBeans("whitefish"); - assert getCurrentManager().getBeans("whitefish").size() == 1; - assert getCurrentManager().getBeans("whitefish").iterator().next().getTypes().contains(AlaskaPlaice.class); + assert beans.size() == 2; + assert getCurrentManager().resolve(beans).getTypes().contains(AlaskaPlaice.class); // Both Salmon and Sole are named "fish" - Sole is an enabled policy - assert getCurrentManager().getBeans("fish").size() == 1; - assert getCurrentManager().getBeans("fish").iterator().next().getTypes().contains(Sole.class); + beans = getCurrentManager().getBeans("fish"); + assert beans.size() == 2; + assert getCurrentManager().resolve(beans).getTypes().contains(Sole.class); } }