Author: pete.muir(a)jboss.org Date: 2009-06-10 09:14:48 -0400 (Wed, 10 Jun 2009) New Revision: 2811 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: update tck to 20090519 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-06-10 13:00:49 UTC (rev 2810) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-06-10 13:14:48 UTC (rev 2811) @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * Spec version: Public Release Draft 2 + * Spec version: 20090519 */ @IntegrationTest @Packaging(PackagingType.EAR) @@ -36,7 +36,8 @@ public class DependentContextEjbTest extends AbstractJSR299Test { @Test(groups = { "contexts", "injection", "ejb3", "integration" }) - @SpecAssertion(section = "8.3", id = "k") + //@SpecAssertion(section = "8.3", id = "k") + @SpecAssertion(section = "unknown", id = "unknown") public void testContextIsActiveDuringEJBDependencyInjection() { Bean<FoxRunLocal> foxRunBean = getBeans(FoxRunLocal.class).iterator().next(); @@ -45,7 +46,7 @@ } @Test(groups = { "contexts", "postconstruct", "ejb3", "integration" }) - @SpecAssertion(section = "8.3", id = "l") + @SpecAssertion(section = "6.4.1", id = "ka") public void testContextIsActiveDuringEJBPostConstruct() { Fox.setDependentContextActiveDuringPostConstruct(false); @@ -54,7 +55,7 @@ } @Test(groups = { "contexts", "ejb3", "integration", "ri-broken"}) - @SpecAssertion(section = "8.3.2", id = "ba") + @SpecAssertion(section = "6.4.3", id = "baa") public void testDestroyingEjbDestroysDependents() throws Exception { new RunInDependentContext() @@ -77,7 +78,7 @@ } @Test(groups = { "contexts", "ejb3", "integration","ri-broken", "broken" }) - @SpecAssertion(section = "8.3.2", id = "ba") + @SpecAssertion(section = "6.4.3", id = "baa") public void testDestroyingEjbDestroysDependentSimples() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 13:00:49 UTC (rev 2810) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 13:14:48 UTC (rev 2811) @@ -2700,9 +2700,17 @@ </assertion> <assertion id="ka"> - <text>The |@Dependent| scope is inactive except when the container is injecting dependencies or invoking the |@PostConstruct| or |@PreDestroy| callback of a Java EE component class supporting injection.</text> + <text>The |@Dependent| scope is inactive except when the container is injecting dependencies ~or invoking the |@PostConstruct| or |@PreDestroy| callback~ of a Java EE component class supporting injection.</text> </assertion> + <assertion id="kb"> + <text>The |@Dependent| scope is inactive except when the container is ~injecting dependencies or~ invoking the |@PostConstruct| ~or |@PreDestroy|~ callback of a Java EE component class supporting injection.</text> + </assertion> + + <assertion id="kc"> + <text>The |@Dependent| scope is inactive except when the container is ~injecting dependencies or~ invoking the ~|@PostConstruct| or~ |@PreDestroy| callback of a Java EE component class supporting injection.</text> + </assertion> + <assertion id="la"> <text>The |@Dependent| scope is inactive except when |Instance.get()|, |Instance.iterator()| or |BeanManager.getReference()| is invoked upon an instance of |Instance| or |BeanManager| injected by the container into a bean or other Java EE component class supporting injection.</text> </assertion>