[webbeans-commits] Webbeans SVN: r1597 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: integration/context/request and 15 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-19 09:43:45 -0500 (Thu, 19 Feb 2009) New Revision: 1597 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java Log: Map more assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.integration.context.application; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -11,81 +11,50 @@ public class ApplicationContextTest extends AbstractDeclarativeTest { - /** - * The application scope is active during the service() method of any servlet - * in the web application. - */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "a") public void testApplicationScopeActiveDuringServiceMethod() { assert false; } - /** - * The application scope is active during any Java EE web service invocation. - */ @Test(groups = { "stub", "contexts", "webservice", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "c") public void testApplicationScopeActiveDuringWebSericeInvocation() { assert false; } - /** - * The application scope is also active during any remote method invocation - * of any EJB bean, during any call to an EJB timeout method and during - * message delivery to any EJB message driven bean. - */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "e") public void testApplicationScopeActiveDuringRemoteMethodInvocationOfEjb() { assert false; } - /** - * The application scope is also active during any remote method invocation - * of any EJB bean, during any call to an EJB timeout method and during - * message delivery to any EJB message driven bean. - */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "f") public void testApplicationScopeActiveDuringCallToEjbTimeoutMethod() { assert false; } - /** - * The application scope is also active during any remote method invocation - * of any EJB bean, during any call to an EJB timeout method and during - * message delivery to any EJB message driven bean. - */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "g") public void testApplicationScopeActiveDuringEjbMessageDelivery() { assert false; } - /** - * The application context is shared between all servlet requests, web - * service invocations, EJB remote method invocations, EJB timeouts and - * message deliveries to message driven beans that execute within the same - * application - */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "h") public void testApplicationContextSharedBetweenInvokationsInApplication() { assert false; } - /** - * The application context is destroyed when the application is undeployed. - */ @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5.3", id = "unknown") + @SpecAssertion(section = "8.5.3", id = "n") public void testApplicationScopeDestroyedWhenApplicationIsUndeployed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.integration.context.request; +import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; /** @@ -16,7 +16,7 @@ * the web application. */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "a") public void testRequestScopeActiveDuringServiceMethod() { assert false; @@ -27,7 +27,7 @@ * the Servlet service() method returns. */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "c") public void testRequestScopeIsDestroyedAfterServiceMethod() { assert false; @@ -37,7 +37,7 @@ * The request scope is active during any Java EE web service invocation. */ @Test(groups = { "stub", "contexts", "webservice", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "d") public void testRequestScopeActiveDuringWebSericeInvocation() { assert false; @@ -48,7 +48,7 @@ * completes */ @Test(groups = { "stub", "contexts", "webservice", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "e") public void testRequestScopeIsDestroyedAfterWebServiceInvocation() { assert false; @@ -60,7 +60,7 @@ * to any EJB message driven bean. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "h") public void testRequestScopeActiveDuringRemoteMethodInvocationOfEjb() { assert false; @@ -72,7 +72,7 @@ * to any EJB message driven bean. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "i") public void testRequestScopeActiveDuringCallToEjbTimeoutMethod() { assert false; @@ -84,7 +84,7 @@ * to any EJB message driven bean. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "j") public void testRequestScopeActiveDuringEjbMessageDelivery() { assert false; @@ -95,7 +95,7 @@ * timeout or message delivery completes. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "k") public void testRequestScopeDestroyedAfterRemoteMethodInvocationOfEjb() { assert false; @@ -106,7 +106,7 @@ * timeout or message delivery completes. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "l") public void testRequestScopeDestroyedAfterCallToEjbTimeoutMethod() { assert false; @@ -117,7 +117,7 @@ * timeout or message delivery completes. */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.5.1", id = "unknown") + @SpecAssertion(section = "8.5.1", id = "m") public void testRequestScopeDestroyedAfterEjbMessageDelivery() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.integration.context.session; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -11,37 +11,32 @@ public class SessionContextTest extends AbstractDeclarativeTest { - /** - * The session scope is active during the service() method of any servlet in - * the web application - */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.5.2", id = "unknown") + @SpecAssertion(section = "8.5.2", id = "a") public void testSessionScopeActiveDuringServiceMethod() { assert false; } - /** - * The session context is shared between all servlet requests that occur in - * the same HTTP servlet session - */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.5.2", id = "unknown") + @SpecAssertion(section = "8.5.2", id = "c") public void testSessionContextSharedBetweenServletRequestsInSameHttpSession() { assert false; } - /** - * The session context is destroyed when the HTTPSession is invalidated or - * times out. - */ @Test(groups = { "stub", "contexts", "integration" }) - @SpecAssertion(section = "8.5.2", id = "unknown") - public void testSessionContextDestroyedWhenHttpSessionInvalidatedOrTimesOut() + @SpecAssertion(section = "8.5.2", id = "d") + public void testSessionContextDestroyedWhenHttpSessionInvalidated() { assert false; } + + @Test(groups = { "stub", "contexts", "integration" }) + @SpecAssertion(section = "8.5.2", id = "e") + public void testSessionContextDestroyedWhenHttpSessionTimesOut() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -9,9 +9,9 @@ import javax.inject.Production; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.jboss.jsr299.tck.literals.CurrentBinding; import org.testng.annotations.Test; @@ -150,7 +150,7 @@ } @Test(groups = { "injection", "producerMethod" }) - @SpecAssertion(section = "2.3.5", id = "unknown") + @SpecAssertion(section = "2.3.5", id = "a") public void testFieldInjectedFromProducerMethod() throws Exception { Barn barn = getCurrentManager().resolveByType(Barn.class).iterator().next().create(new MockCreationalContext<Barn>()); @@ -192,14 +192,14 @@ } @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "2.3.6", id = "unknown") + @SpecAssertion(section = "2.3.6", id = "e") public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() { assert false; } @Test(groups = { "stub", "injection", "webbeansxml" }) - @SpecAssertion(section = "2.3.6", id = "unknown") + @SpecAssertion(section = "2.3.6", id = "f") public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -9,9 +9,9 @@ import javax.inject.UnsatisfiedDependencyException; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -147,8 +147,8 @@ * type declared by stereotypes are ignored. */ @Test(groups = { "deploymentType" }) - @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "unknown"), - @SpecAssertion(section = "2.7.2", id = "unknown"), + @SpecAssertions( { @SpecAssertion(section = "2.5.5", id = "c"), + @SpecAssertion(section = "2.7.2", id = "da"), @SpecAssertion(section = "4.1", id = "d") }) public void testWebBeanDeploymentTypeOverridesStereotype() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -10,13 +10,13 @@ * * Spec version: PRD2 */ -@Test(alwaysRun=true) +@Test public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest { @SuppressWarnings("unchecked") @Test(expectedExceptions=DeploymentException.class, groups="broken") - @SpecAssertion(section="2.5.6", id = "unknown") + @SpecAssertion(section="2.5.6", id = "c") public void testStandardMustBeDeclared() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -38,7 +38,7 @@ * DefinitionException is thrown by the container at deployment time. */ @Test(groups = { "deploymentType"}) - @SpecAssertion(section = "2.5.3", id = "unknown") + @SpecAssertion(section = "2.5.3", id = "d") public void testTooManyDeploymentTypes() { } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -22,8 +22,7 @@ @SuppressWarnings("unchecked") @Test @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "unknown"), - @SpecAssertion(section = "2.5.7", id = "unknown") + @SpecAssertion(section = "2.5.6", id = "b") }) public void testCustomDeploymentTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -7,7 +7,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; import org.testng.annotations.Test; /** @@ -21,8 +20,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "unknown"), - @SpecAssertion(section = "2.5.7", id = "unknown") + @SpecAssertion(section = "2.5.6", id = "unknown") }) public void testDefaultEnabledDeploymentTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -6,9 +6,9 @@ import javax.inject.DefinitionException; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -99,7 +99,7 @@ @Test @SpecAssertions({ @SpecAssertion(section= "2.6.3", id = "a"), - @SpecAssertion(section = "3.2.7", id = "unknown") + @SpecAssertion(section = "3.2.8", id = "a") }) public void testDefaultNamed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -6,9 +6,9 @@ import javax.inject.DefinitionException; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -156,7 +156,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "d"), + @SpecAssertion(section = "2.7.2", id = "db"), @SpecAssertion(section = "4.1", id = "h") }) public void testWebBeanScopeTypeOverridesStereotype() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.unit.implementation.enterprise; +import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; /** @@ -24,7 +24,7 @@ * passed to the method by the Web Bean manager */ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) - @SpecAssertion(section = "3.3.1", id = "unknown") + @SpecAssertion(section = "3.3.1", id = "da") public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() { assert false; @@ -36,7 +36,7 @@ * scope other than @Dependent, an UnsupportedOperationException is thrown. */ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class) - @SpecAssertion(section = "3.3.1", id = "unknown") + @SpecAssertion(section = "3.3.1", id = "c") public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean() { assert false; @@ -49,7 +49,7 @@ * destroying it */ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) - @SpecAssertion(section = "3.3.1", id = "unknown") + @SpecAssertion(section = "3.3.1", id = "db") public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -3,9 +3,9 @@ import javax.inject.DefinitionException; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @@ -127,7 +127,7 @@ } @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) - @SpecAssertion(section = "3.9.2", id = "unknown") + @SpecAssertion(section = "3.9.2", id = "review") public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -12,9 +12,9 @@ import javax.inject.Standard; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.literals.CurrentBinding; import org.testng.annotations.Test; @@ -102,7 +102,7 @@ @Test(groups = "producerField") @SpecAssertions({ @SpecAssertion(section = "3.5", id = "review"), - @SpecAssertion(section = "2.3.1", id = "unknown") + @SpecAssertion(section = "2.3.1", id = "a") }) public void testDefaultBindingType() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -9,9 +9,9 @@ import javax.inject.Production; import javax.inject.Standard; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -43,7 +43,7 @@ * value. */ @Test(groups = { "producerField" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "6.8", id = "unknown") public void testProducerStaticFieldBean() { deployBeans(StaticTarantulaProducer.class, TarantulaConsumer.class); @@ -121,9 +121,8 @@ */ @Test(groups = { "producerField" }) @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "unknown"), - @SpecAssertion(section = "6.8", id = "unknown"), - @SpecAssertion(section = "8.3", id = "unknown") + @SpecAssertion(section = "3.5", id = "d"), + @SpecAssertion(section = "6.8", id = "unknown") }) public void testProducerFieldReturnsNullIsDependent() throws Exception { @@ -148,7 +147,7 @@ */ @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class) @SpecAssertions({ - @SpecAssertion(section = "3.5", id = "unknown"), + @SpecAssertion(section = "3.5", id = "e"), @SpecAssertion(section = "6.8", id = "unknown") }) public void testProducerFieldReturnsNullIsNotDependent() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -8,9 +8,9 @@ import javax.inject.IllegalProductException; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; @@ -75,21 +75,13 @@ } @Test(groups = { "stub", "disposalMethod", "beanLifecycle" }) - @SpecAssertion(section = "3.3.5", id = "unknown") + @SpecAssertion(section = "6.7", id = "unknown") public void testDisposalMethodCalled() { // TODO Placeholder assert false; } - @Test(groups = { "stub", "disposalMethod", "beanLifecycle" }) - @SpecAssertion(section = "3.3.5", id = "unknown") - public void testDisposalMethodHasParametersInjected() - { - // TODO Placeholder - assert false; - } - @Test(groups = { "producerMethod", "broken" }) @SpecAssertions( { @SpecAssertion(section = "3.4", id = "unknown"), @SpecAssertion(section = "B.1", id = "unknown"), @SpecAssertion(section = "7.3", id = "unknown") }) public void testProducerMethodReturnsNullIsDependent() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -30,8 +30,8 @@ import javax.inject.manager.Bean; import javax.inject.manager.InjectionPoint; +import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.literals.CurrentBinding; import org.testng.annotations.Test; @@ -46,7 +46,7 @@ { @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "a") public void testGetBean() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -70,7 +70,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "ba") public void testGetType() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -91,7 +91,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "bc") public void testGetBindingTypes() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -114,7 +114,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "ca") public void testGetMemberField() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -135,7 +135,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "cb") public void testGetMemberMethod() { deployBeans(MethodInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -161,7 +161,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "cc") public void testGetMemberConstructor() { deployBeans(ConstructorInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -187,7 +187,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "da") public void testGetAnnotation() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -208,7 +208,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "dd") public void testGetAnnotations() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -232,7 +232,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "za") public void testStandardDeployment() throws Exception { deployBeans(); @@ -251,7 +251,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "zb") public void testDependentScope() throws Exception { deployBeans(); @@ -270,7 +270,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "zc") public void testApiTypeInjectionPoint() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -291,7 +291,7 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6", id = "unknown") + @SpecAssertion(section = "5.6", id = "zd") public void testCurrentBinding() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-19 13:39:49 UTC (rev 1596) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-19 14:43:45 UTC (rev 1597) @@ -11,9 +11,9 @@ import javax.inject.TypeLiteral; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.literals.CurrentBinding; import org.testng.annotations.Test; @@ -100,7 +100,7 @@ @Test(groups="injection") @SpecAssertions({ - @SpecAssertion(section = "2.3.5", id = "unknown"), + @SpecAssertion(section = "2.3.5", id = "b"), @SpecAssertion(section = "5.9.2", id = "unknown") }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()