Author: pete.muir(a)jboss.org Date: 2009-03-08 19:52:34 -0400 (Sun, 08 Mar 2009) New Revision: 1840 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: some fixes to tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-08 23:52:23 UTC (rev 1839) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-08 23:52:34 UTC (rev 1840) @@ -98,9 +98,10 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "c"), - @SpecAssertion(section = "2.7.2", id = "da"), - @SpecAssertion(section = "4.1", id = "da") }) + @SpecAssertions( { + @SpecAssertion(section = "2.5.5", id = "c"), + @SpecAssertion(section = "2.7.2", id = "da") + }) public void testWebBeanDeploymentTypeOverridesStereotype() { assert getCurrentManager().resolveByType(Reindeer.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-03-08 23:52:23 UTC (rev 1839) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-03-08 23:52:34 UTC (rev 1840) @@ -426,7 +426,10 @@ * */ @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "l") + @SpecAssertions({ + @SpecAssertion(section = "7.5.8", id = "l"), + @SpecAssertion(section = "4.3.2", id = "f") + }) public void testObserverCalledOnMostSpecializedInstance() { Shop.deliveryObservedBy = null; @@ -752,7 +755,7 @@ * @throws Exception */ @Test(groups = { "events", "inheritance" }) - @SpecAssertion(section = "4", id = "a") + @SpecAssertion(section = "4.2", id = "dc") public void testNonStaticObserverMethodNotInherited() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-03-08 23:52:23 UTC (rev 1839) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-03-08 23:52:34 UTC (rev 1840) @@ -60,7 +60,10 @@ } @Test(groups = { "producerField", "specialization" }) - @SpecAssertion(section = "6.8", id = "i") + @SpecAssertions({ + @SpecAssertion(section = "6.8", id = "i"), + @SpecAssertion(section = "4.3.2", id = "d") + }) public void testSpecializedBeanAlwaysUsed() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-03-08 23:52:23 UTC (rev 1839) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-03-08 23:52:34 UTC (rev 1840) @@ -38,7 +38,8 @@ @Test(groups = { "specialization" }) @SpecAssertions({ - @SpecAssertion(section = "6.7", id = "g") + @SpecAssertion(section = "6.7", id = "g"), + @SpecAssertion(section = "4.3.2", id = "c") }) public void testSpecializedBeanAlwaysUsed() throws Exception { Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-08 23:52:23 UTC (rev 1839) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-08 23:52:34 UTC (rev 1840) @@ -2293,24 +2293,29 @@ <text>For class X which is the bean class of a _session_ bean Y declared using XML, the scope types and deployment types explicitly declared by and inherited from the class X take precedence over default scope and deployment types declared by stereotypes.</text> </assertion> - <assertion id="i"> + <assertion id="i" testable="false"> <text>For annotations defined by the bean specification, all built-in _scope types_ are declared @Inherited</text> + <note>sigtest</note> </assertion> - <assertion id="j"> + <assertion id="j" testable="false"> <text>For annotations defined by the bean specification, all built-in _stereotypes_ are declared @Inherited</text> + <note>sigtest</note> </assertion> - <assertion id="k"> + <assertion id="k" testable="false"> <text>For annotations defined by the bean specification, _no built-in binding type is declared @Inherited_</text> + <note>sigtest</note> </assertion> - <assertion id="l"> + <assertion id="l" testable="false"> <text>For annotations defined by the bean specification, _the built-in deployment type is not declared @Inherited_</text> + <note>sigtest</note> </assertion> - <assertion id="m"> + <assertion id="m" testable="false"> <text>the @Named annotation is not declared @Inherited and bean names are not inherited unless specialization is used</text> + <note>sigtest</note> </assertion> </section> @@ -2627,12 +2632,14 @@ </section> <section id="4.3.2" title="Direct and indirect specialization"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The @javax.inject.Specializes annotation or &lt;Specializes&gt; XML element is used to indicate that one bean directly specializes another bean</text> + <note>A statement of intent</note> </assertion> - <assertion id="b"> + <assertion id="b" testable="false"> <text>A bean X is said to specialize another bean Y if X directly specializes Y, or a bean Z exists, such that X directly specializes Z and Z specializes Y</text> + <note>A definition</note> </assertion> <assertion id="c"> @@ -2659,23 +2666,27 @@ </section> <section id="4.4" title="Realization"> - <assertion id="a"> - <text>Any bean that extends a generic class may directly extend the generic class, in the case of a bean declared using annotations</text> + <assertion id="a" testable="false"> + <text>Any bean that extends a generic class may directly extend the generic class, in the case of a bean declared using annotations and then explicitly declare that it realizes the generic class</text> + <note>A statement of intent</note> </assertion> - <assertion id="b"> - <text>Any bean that extends a generic class may declare that the generic class is the bean class, in the case of a bean declared using XML, and then explicitly declare that it realizes the generic class.</text> + <assertion id="b" testable="false"> + <text>Any bean that extends a generic class may declare that the generic class is the bean class, in the case of a bean declared using XML and then explicitly declare that it realizes the generic class.</text> + <note>A statement of intent</note> </assertion> </section> <section id="4.4.1" title="Using realization"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>A bean declared using annotations may declare that it realizes a generic class by annotating the bean class with the @javax.inject.Realizes annotation</text> + <note>A statement of intent</note> </assertion> - <assertion id="b"> + <assertion id="b" testable="false"> <text>A bean declared using XML may declare that it realizes a generic class using the &lt;Realizes&gt; element.</text> + <note>A statement of intent</note> </assertion> <assertion id="ca"> @@ -2696,8 +2707,9 @@ this inherited observer method consist of all event bindings declared by the event parameter of the observer method of Y.</text> </assertion> - <assertion id="f"> + <assertion id="f" testable="false"> <text>Realization applies only to simple beans and session beans</text> + <note>A statement of intent</note> </assertion> </section>