Author: pete.muir(a)jboss.org Date: 2010-01-22 11:41:10 -0500 (Fri, 22 Jan 2010) New Revision: 5591 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java Log: port WELD-10 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:39:43 UTC (rev 5590) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:41:10 UTC (rev 5591) @@ -37,11 +37,10 @@ @ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { - @Test(groups = { "passivation", "ri-wrong-cause" }) + @Test(groups = { "passivation" }) @SpecAssertions({ @SpecAssertion(section = "6.6.1", id = "db") }) - // TODO RI is causing a deployement problem, but for the wrong reason public void testNonPassivationCapableProducerFieldNotOk() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:39:43 UTC (rev 5590) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2010-01-22 16:41:10 UTC (rev 5591) @@ -37,11 +37,10 @@ @ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test { - @Test(groups = { "passivation", "ri-wrong-cause" }) + @Test(groups = { "passivation" }) @SpecAssertions({ @SpecAssertion(section = "6.6.4", id = "d") }) - // TODO RI is erroring, but for the wrong reason public void testNonPassivationCapableProducerFieldNotOk() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-22 16:39:43 UTC (rev 5590) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2010-01-22 16:41:10 UTC (rev 5591) @@ -37,12 +37,11 @@ @ExpectedDeploymentException(DeploymentFailure.class) public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test { - @Test(groups = { "passivation", "ri-wrong-cause" }) + @Test(groups = { "passivation" }) @SpecAssertions({ @SpecAssertion(section = "6.6.1", id = "cb"), @SpecAssertion(section = "6.6.4", id = "ca") }) - // TODO Test passes, but with wrong exception public void testNonPassivationCapableProducerMethodNotOk() { assert false;