Author: pete.muir(a)jboss.org Date: 2009-07-27 18:37:48 -0400 (Mon, 27 Jul 2009) New Revision: 3293 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.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/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.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/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Match in a load of tests and add one Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -7,10 +7,10 @@ import javax.enterprise.context.SessionScoped; import javax.enterprise.context.spi.Context; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; @@ -50,6 +50,7 @@ assert context != null; context = getCurrentManager().getContext(ApplicationScoped.class); assert context != null; - // QUESTION why can't we grab the ConversionScoped context here? + // Can't test conversations here, they are only available for a JSF + // request. Standalone container only simulates a servlet request } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.context.conversation.client; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; @@ -36,7 +37,11 @@ private static final String REDIRECT_STORM_STRENGTH = "15"; @Test(groups = { "contexts" }) - @SpecAssertion(section = "6.7.4", id = "l") + @SpecAssertions({ + @SpecAssertion(section = "6.7.4", id = "l"), + @SpecAssertion(section = "2.4.1", id="ba") + }) + public void testConversationPropagated() throws Exception { WebClient webClient = new WebClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -9,10 +9,10 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -43,7 +43,10 @@ } @Test - @SpecAssertion(section = "2.7", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "2.7", id = "c"), + @SpecAssertion(section = "2.7.1", id = "b") + }) public void testOneStereotypeAllowed() { Bean<LongHairedDog> bean = getBeans(LongHairedDog.class).iterator().next(); 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-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -9,7 +9,6 @@ import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; @@ -114,7 +113,8 @@ @Test(groups = { "events" }) @SpecAssertions( { @SpecAssertion(section = "10.4.3", id = "a"), - @SpecAssertion(section = "5.6.8", id = "c") + @SpecAssertion(section = "5.6.8", id = "c"), + @SpecAssertion(section = "2.3.5", id = "ca") }) public void testObserverMethodReceivesInjectionsOnNonObservesParameters() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -6,10 +6,10 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -29,6 +29,7 @@ @SpecAssertion(section = "3.3.5", id = "e"), @SpecAssertion(section = "3.3.6", id = "ba"), @SpecAssertion(section = "3.3.7", id = "a"), + @SpecAssertion(section = "3.3.7", id = "b0"), @SpecAssertion(section = "3.3.9", id = "aa"), @SpecAssertion(section = "5.6.6", id = "b") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -9,23 +9,25 @@ private static boolean tameSpiderDestroyed = false; private static boolean deadliestSpiderDestroyed = false; - @Produces @Tame public Tarantula produceTameTarantula() + @Produces + @Tame + public Tarantula produceTameTarantula() { return new DefangedTarantula(0); } - - @Produces @Deadliest public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula, - @Current Tarantula tarantula) - { - return tameTarantula.getDeathsCaused() >= tarantula.getDeathsCaused() ? - tameTarantula : tarantula; + + @Produces + @Deadliest + public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula, @Current Tarantula tarantula) + { + return tameTarantula.getDeathsCaused() >= tarantula.getDeathsCaused() ? tameTarantula : tarantula; } - + public void destroyTameSpider(@Disposes @Tame Tarantula spider) { SpiderProducer.tameSpiderDestroyed = true; } - + public static void destroyDeadliestSpider(@Disposes @Deadliest Tarantula spider, @Current Tarantula anotherSpider) { assert spider != anotherSpider; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -7,10 +7,10 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; @@ -93,7 +93,10 @@ } @Test(groups = "enterpriseBeans") - @SpecAssertion(section = "3.2.3", id = "ba") + @SpecAssertions({ + @SpecAssertion(section = "3.2.3", id = "ba"), + @SpecAssertion(section = "3.2", id = "e") + }) public void testBeanWithScopeAnnotation() { Bean<LionLocal> lionBean = getBeans(LionLocal.class).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -11,10 +11,10 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -42,7 +42,6 @@ @Test(groups = {"enterpriseBeans", "clientProxy", "lifecycle", "integration" }) @SpecAssertions( { - @SpecAssertion(section = "3.2.5", id = "a"), @SpecAssertion(section = "7.3.2", id = "aa"), @SpecAssertion(section = "7.3.2", id = "bb"), @SpecAssertion(section = "7.3.3", id = "b") Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java (from rev 3291, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces; + + +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") +public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test +{ + + @Test(groups = "initializerMethod") + @SpecAssertions( { @SpecAssertion(section = "3.8.1", id = "ba"), + @SpecAssertion(section = "3.3.2", id = "ca") }) + public void testInitializerMethodAnnotatedProduces() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -1,27 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.initializer.broken.methodAnnotatedProduces; - - -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -@SpecVersion("20090625") -public class MethodAnnotatedProducesTest extends AbstractJSR299Test -{ - - @Test(groups = "initializerMethod") - @SpecAssertions( { @SpecAssertion(section = "3.8.1", id = "ba"), - @SpecAssertion(section = "3.3.2", id = "ca") }) - public void testInitializerMethodAnnotatedProduces() - { - assert false; - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -7,11 +7,11 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.literals.CurrentLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -96,7 +96,7 @@ } @Test(groups = { "producerField" }) - @SpecAssertion(section = "3.4.1", id = "b") + @SpecAssertion(section = "3.4.1", id = "ba") public void testApiTypeForPrimitiveReturn() { Set<Bean<?>> beans = getCurrentManager().getBeans("SpiderSize"); @@ -109,7 +109,7 @@ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "3.4.1", id = "b"), + @SpecAssertion(section = "3.4.1", id = "bb"), @SpecAssertion(section = "2.2.1", id = "i") }) public void testApiTypeForArrayTypeReturn() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -17,8 +17,10 @@ { @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.3", id = "ia") +// @SpecAssertion(section = "3.3", id = "ia") + @SpecAssertion(section = "review", id = "review") }) + // I think we can remove this test, it looks very out of date to me and I think 3.3 iaa/ib specifically allow this PLM public void testParameterizedReturnTypeWithTypeParameter() throws Exception { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -17,7 +17,7 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.3", id = "ia"), + @SpecAssertion(section = "3.3", id = "ib"), @SpecAssertion(section = "2.2.1", id="la") }) public void testParameterizedType() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -18,7 +18,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.4", id = "ha"), + @SpecAssertion(section = "3.3", id = "ha"), @SpecAssertion(section="2.2.1", id="lb") }) public void testParameterizedReturnTypeWithWildcard() throws Exception 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-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -115,7 +115,7 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.3.1", id = "b") + @SpecAssertion(section = "3.3.1", id = "ba") public void testApiTypeForPrimitiveReturn() throws Exception { assert getBeans(Integer.class).size() == 1; @@ -127,7 +127,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ - @SpecAssertion(section = "3.3.1", id = "b"), + @SpecAssertion(section = "3.3.1", id = "bb"), @SpecAssertion(section = "2.2.1", id = "i") }) public void testApiTypeForArrayTypeReturn() throws Exception @@ -229,7 +229,11 @@ } @Test - @SpecAssertion(section = "2.3.5", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "2.3.5", id = "a"), + @SpecAssertion(section = "3.3.3", id = "c"), + @SpecAssertion(section = "3.3.3", id = "b") + }) public void testBindingTypesAppliedToProducerMethodParameters() { Bean<Tarantula> tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); 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-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -7,10 +7,10 @@ import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.spi.Bean; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -44,8 +44,6 @@ @Test(groups = { "producerMethod" }) @SpecAssertions({ - @SpecAssertion(section = "3.3.3", id = "b"), - @SpecAssertion(section = "3.3.3", id = "c"), @SpecAssertion(section = "7.3.4", id = "ea") }) public void testProducerMethodInvokedOnCreate() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -1,12 +1,15 @@ package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.Any; import javax.enterprise.inject.spi.Bean; +import javax.persistence.EntityManager; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -54,4 +57,19 @@ assert managedBean.getPersistenceUnit() != null : "Persistence unit was not injected into bean"; assert managedBean.getPersistenceUnit().isOpen() : "Persistence unit not open injected into bean"; } + + @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertions( { + @SpecAssertion(section = "3.5.2", id = "a"), + @SpecAssertion(section = "3.5.1", id = "hh") + }) + public void testBeanTypesAndBindingTypesOfPersistenceContext() + { + Bean<EntityManager> managedBeanBean = getBeans(EntityManager.class, new AnnotationLiteral<Default>() {}).iterator().next(); + assert managedBeanBean.getTypes().size() == 2; + assert managedBeanBean.getTypes().contains(Object.class); + assert managedBeanBean.getTypes().contains(EntityManager.class); + assert managedBeanBean.getBindings().size() == 2; + assert annotationSetMatches(managedBeanBean.getBindings(), Any.class, Default.class); + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -28,7 +28,7 @@ @Test @SpecAssertions({ @SpecAssertion(section = "4.3.1", id = "j"), - @SpecAssertion(section = "3.3.4", id = "aa") + @SpecAssertion(section = "3.2.4", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-07-27 22:37:48 UTC (rev 3293) @@ -5,10 +5,10 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.Any; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -24,7 +24,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "5.6.6", id = "c") + @SpecAssertion(section = "5.6.6", id = "c"), + @SpecAssertion(section = "3.3.4", id = "aa") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 21:21:44 UTC (rev 3292) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 22:37:48 UTC (rev 3293) @@ -679,10 +679,12 @@ <assertion id="e"> <text>A stateful session bean may have any scope.</text> + <note>No way of testing the real intent of this statement, so we check that a SFSB may be scoped</note> </assertion> - <assertion id="f"> + <assertion id="f" testable="false"> <text>When a contextual instance of a session bean is obtained via the dependency injection service, the behavior of |SessionContext.getInvokedBusinessInterface()| is specific to the container implementation. Portable applications should not rely upon the value returned by this method.</text> + <note>This is describing non-portable behavior</note> </assertion> <assertion id="g"> @@ -814,9 +816,13 @@ <text>If a producer method return type contains a wildcard type parameter the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> - <assertion id="ia"> - <text>If the producer method return type is a parameterized type with a type variable, it must have scope |@Dependent|. If a producer method with a parameterized return type with a type variable declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + <assertion id="iaa"> + <text>If the producer method return type is a parameterized type with a type variable, it must have scope |(a)Dependent|.&lt;/text&gt; </assertion> + + <assertion id="iab"> + <text>If a producer method with a parameterized return type with a type variable declares any scope other than |@Dependent|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + </assertion> <assertion id="ib"> <text>If a producer method return type is a type variable the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> @@ -836,9 +842,13 @@ <text>If the return type of a producer method is an interface, the set of bean types contains the return type, all interfaces it extends directly or indirectly and |java.lang.Object|</text> </assertion> - <assertion id="b"> - <text>If a return type of a producer method is primitive or is a Java array type, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text> + <assertion id="ba"> + <text>If a return type of a producer method is primitive ~or is a Java array type~, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text> </assertion> + + <assertion id="bb"> + <text>If a return type of a producer method is ~primitive or is~ a Java array type, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text> + </assertion> <assertion id="c"> <text>If the return type of a producer method is a class, the set of bean types contains the return type, every superclass and all interfaces it implements directly or indirectly.</text> @@ -882,9 +892,13 @@ <text>If a non-static method of a session bean class is annotated |@Produces|, and the method is not a business method of the session bean, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> - <assertion id="g"> - <text>Interceptors and decorators may not declare producer methods. If an interceptor or decorator has a method annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + <assertion id="ga"> + <text>Interceptors ~and decorators~ may not declare producer methods. If an interceptor ~or decorator~ has a method annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> </assertion> + + <assertion id="gb"> + <text>~Interceptors and~ decorators may not declare producer methods. If an ~interceptor or~ decorator has a method annotated |@Produces|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + </assertion> </section> <section id="3.3.3" title="Producer method parameters"> @@ -1031,8 +1045,12 @@ </assertion> <assertion id="fa"> - <text>If the producer field type is a parameterized type, it must specify an actual type parameter or type variable for each type parameter</text> + <text>If the producer field type is a parameterized type, it must specify an _actual type parameter_ or type variable for each type parameter</text> </assertion> + + <assertion id="fb"> + <text>If the producer field type is a parameterized type, it must specify an actual type parameter or _type variable_ for each type parameter</text> + </assertion> <assertion id="ga"> <text>If a producer field type contains a wildcard type parameter the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> @@ -1061,9 +1079,13 @@ <text>The bean types of a producer field depend upon the field type. If the field type is an interface, the set of bean types contains the field type, all interfaces it extends directly or indirectly and java.lang.Object</text> </assertion> - <assertion id="b"> - <text>The bean types of a producer field depend upon the field type. If a field type is primitive or is a Java array type, the set of bean types contains exactly two types: the field type and java.lang.Object</text> + <assertion id="ba"> + <text>The bean types of a producer field depend upon the field type. If a field type is primitive ~or is a Java array type,~ the set of bean types contains exactly two types: the field type and java.lang.Object</text> </assertion> + + <assertion id="bb"> + <text>The bean types of a producer field depend upon the field type. If a field type is ~primitive or is~ a Java array type, the set of bean types contains exactly two types: the field type and java.lang.Object</text> + </assertion> <assertion id="c"> <text>The bean types of a producer field depend upon the field type. If the field type is a class, the set of bean types contains the field type, every superclass and all interfaces it implements directly or indirectly</text> @@ -1099,18 +1121,21 @@ </section> <section id="3.5" title="Resources"> - <assertion id="ka"> + <assertion id="ka" testable="false"> <text>The container is not required to support resources with scope other than |(a)Dependent|.&lt;/text&gt; + <note>Statement about non-portable behavior</note> </assertion> - <assertion id="l"> + <assertion id="l" testable="false"> <text>A resource may not declare a bean EL name</text> + <note>Doesn't mention the consequences of this</note> </assertion> </section> <section id="3.5.1" title="Declaring a resource"> - <assertion id="aa"> + <assertion id="aa" testable="false"> <text>A resource may be declared by specifying a Java EE component environment injection annotation as part of a producer field declaration.</text> + <note>Introductory text for the folloiwing assertions</note> </assertion> <assertion id="bb"> @@ -1133,8 +1158,9 @@ <text>For a web service, |@WebServiceRef| must be specified.</text> </assertion> - <assertion id="gg"> + <assertion id="gg" testable="false"> <text>The injection annotation specifies the metadata needed to obtain the resources, entity manager, entity manager factory, remote EJB instance or web service reference from the component environment.</text> + <note>This is defined in other specs</note> </assertion> <assertion id="hh">