Author: pete.muir(a)jboss.org Date: 2009-07-26 14:29:11 -0400 (Sun, 26 Jul 2009) New Revision: 3243 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Remove wrong assignment, split up assertion, add WBRI Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-26 18:08:03 UTC (rev 3242) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-26 18:29:11 UTC (rev 3243) @@ -1,8 +1,5 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; -import java.util.Set; - -import javax.enterprise.event.Observer; import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; @@ -44,8 +41,7 @@ @Test(groups = { "events" }) @SpecAssertions({ @SpecAssertion(section = "10.4.1", id = "a"), - @SpecAssertion(section = "10.2.2", id = "a"), - @SpecAssertion(section = "10.2.2", id = "b") + @SpecAssertion(section = "10.2.2", id = "a") }) public void testResolvingChecksBindingTypeMembers() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-07-26 18:08:03 UTC (rev 3242) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-07-26 18:29:11 UTC (rev 3243) @@ -35,7 +35,7 @@ { @Test(groups = { "resolution", "el", "ri-broken" }) - @SpecAssertion(section = "5.4.1", id = "d") + @SpecAssertion(section = "5.4.1", id = "da") // See WBRI-304 public void testDuplicateNamedBeans() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-07-26 18:08:03 UTC (rev 3242) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-07-26 18:29:11 UTC (rev 3243) @@ -35,10 +35,12 @@ public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test { - @Test(groups = { "resolution", "el", "ri-broken"}) - @SpecAssertion(section="5.4.1", id="d") - public void testDuplicateBeanNamePrefix() { + @Test(groups = { "resolution", "el", "ri-broken" }) + @SpecAssertion(section = "5.4.1", id = "db") + // WBRI-305 + public void testDuplicateBeanNamePrefix() + { assert false; } - + } Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-26 18:08:03 UTC (rev 3242) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-26 18:29:11 UTC (rev 3243) @@ -1894,9 +1894,13 @@ <text>An ambiguous EL name exists in an EL expression when there are multiple beans which match the given EL name. When an ambiguous EL name exists, the container attempts to resolve the ambiguity - if any matching beans are policies, the container eliminates all matching beans that are not policies. The container eliminates all matching beans that are specialized by some other matching bean. If there is exactly one bean remaining, the container will select this bean, and the ambiguous name is called resolvable.</text> </assertion> - <assertion id="d"> - <text>All unresolvable ambiguous EL names are detected by the container when the application is initialized. Suppose two beans are both accessible to classes in a certain war, according to the class loading requirements of the Java EE platform and Java Servlet specifications. If each bean is either not a policy, or is an enabled policy of the war, and either the two beans have the same EL name and the name is not resolvable, or the EL name of one bean is of the form x.y, where y is a valid bean EL name, and x is the EL name of the other bean, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> + <assertion id="da"> + <text>All unresolvable ambiguous EL names are detected by the container when the application is initialized. Suppose two beans are both accessible to classes in a certain war, according to the class loading requirements of the Java EE platform and Java Servlet specifications. If each bean is either not a policy, or is an enabled policy of the war, and either _the two beans have the same EL name and the name is not resolvable_, or the EL name of one bean is of the form x.y, where y is a valid bean EL name, and x is the EL name of the other bean, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> + + <assertion id="db"> + <text>All unresolvable ambiguous EL names are detected by the container when the application is initialized. Suppose two beans are both accessible to classes in a certain war, according to the class loading requirements of the Java EE platform and Java Servlet specifications. If each bean is either not a policy, or is an enabled policy of the war, and either the two beans have the same EL name and the name is not resolvable, _or the EL name of one bean is of the form x.y, where y is a valid bean EL name, and x is the EL name of the other bean_, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> + </assertion> </section> <section id="5.5" title="Client proxies"> @@ -3629,7 +3633,7 @@ </assertion> <assertion id="b" testable="false"> - <text>The container uses |equals()| to compare event binding type member values.</text> + <text>The container uses |equals()| to compare event binding type member values.</text> <note>Since only primitive types are allowed, the call to equals() cannot be checked</note> </assertion> </section>