Author: pete.muir(a)jboss.org Date: 2009-07-22 09:13:34 -0400 (Wed, 22 Jul 2009) New Revision: 3132 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/newAndOtherBinding/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.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/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Removev uneeded tests, assign some Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-22 13:13:34 UTC (rev 3132) @@ -16,7 +16,7 @@ { @Test(groups = { "contexts", "passivation"}) - @SpecAssertion(section = "8.4", id = "k") + @SpecAssertion(section = "6.6.4", id = "ba") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() { // WBRI-150 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-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-07-22 13:13:34 UTC (rev 3132) @@ -21,7 +21,7 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "7.3.5", id = "review") // removed from spec + @SpecAssertion(section = "3.4", id = "aa") // removed from spec }) public void testProducerFieldNotAnotherBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-22 13:13:34 UTC (rev 3132) @@ -34,7 +34,6 @@ @Test(groups = "producerMethod") @SpecAssertions( { @SpecAssertion(section = "3.3", id = "b"), - @SpecAssertion(section = "7.3.4", id = "a"), @SpecAssertion(section = "5.6.6", id = "a") } ) public void testStaticMethod() throws Exception @@ -170,17 +169,6 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "review", id = "review"), // deployment types removed from spec - @SpecAssertion(section = "review", id = "review") - }) - public void testDeploymentType() throws Exception - { - assert getBeans(LadybirdSpider.class, TAME_LITERAL).size() == 1; - Bean<LadybirdSpider> ladybirdSpider = getBeans(LadybirdSpider.class).iterator().next(); - } - - @Test(groups = "producerMethod") - @SpecAssertions({ @SpecAssertion(section = "3.3.2", id = "bb"), @SpecAssertion(section = "2.5.1", id = "b") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-22 13:13:34 UTC (rev 3132) @@ -118,15 +118,15 @@ assert fishPond.postConstructCalled = true; // required by Managed Bean specification } - @Test(groups = "beanLifecycle") + @Test(groups = {"beanLifecycle", "broken"}) @SpecAssertions({ @SpecAssertion(section="2", id="g"), @SpecAssertion(section="2.2.1", id="b"), - @SpecAssertion(section="3.1.6", id="a"), @SpecAssertion(section = "7", id = "d") }) public void testCreateReturnsInstanceOfBean() { + // TODO Test needs to use create()!!! PLM assert getBeans(RedSnapper.class).size() == 1; assert getInstanceByType(RedSnapper.class) instanceof RedSnapper; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-22 13:13:34 UTC (rev 3132) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean; import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; import java.util.Set; import javax.enterprise.context.Dependent; @@ -163,19 +161,6 @@ }.run(); } - @Test(groups = { "new" }) - @SpecAssertion(section = "review", id = "review") - public void testNewAnnotationCannotBeExplicitlyDeclared() - { - // All we can really do is make sure the annotation itself - // prevents the compiler from violating the assertion - Target target = New.class.getAnnotation(Target.class); - for (ElementType elementType : target.value()) - { - assert !elementType.equals(ElementType.TYPE); - } - } - @Test @SpecAssertion(section = "3.10", id = "d") public void testForEachSimpleBeanANewBeanExists() Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 13:01:46 UTC (rev 3131) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 13:13:34 UTC (rev 3132) @@ -998,9 +998,15 @@ </section> <section id="3.4" title="Producer fields"> - <assertion id="a"> - <text>A producer field must be a field of a managed bean class or session bean class</text> + <assertion id="aa"> + <text>A producer field must be a field of a managed bean class ~or session bean class~</text> + <note>Just test that a producer field on these works</note> </assertion> + + <assertion id="ab"> + <text>A producer field must be a field of a ~managed bean class or~ session bean class</text> + <note>Just test that a producer field on these works</note> + </assertion> <assertion id="b"> <text>A producer field may be static.</text>