August 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r3440 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:18:07 -0400 (Tue, 11 Aug 2009) New Revision: 3440 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken19/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod (from rev 3433, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken19) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken19/Broken_Record.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java 2009-08-11 12:18:07 UTC (rev 3440) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken19; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod; class Broken_Record { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken19/NonPassivationCapableProducerMethodTest.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-08-11 12:18:07 UTC (rev 3440) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken19; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod; import org.jboss.jsr299.tck.DeploymentError; import org.jboss.test.audit.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken19/RecordProducer.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java 2009-08-11 12:18:07 UTC (rev 3440) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken19; +package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod; import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Produces;

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3439 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:14:24 -0400 (Tue, 11 Aug 2009) New Revision: 3439 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod (from rev 3433, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/CityDecorator.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityDecorator.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken18; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/CityInterface.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/CityInterface.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken18; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; interface CityInterface { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java (from rev 3433, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "6.6.4", id = "aah") + public void testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/NonPassivating.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken18; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; class NonPassivating { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken18; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class PassivationCapableBeanWIthNonPassivatingInitializerInDecorator extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation" }) - @SpecAssertion(section = "6.6.4", id = "aah") - public void testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails() - { - assert false; - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/UnderwaterCity.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java 2009-08-11 12:14:24 UTC (rev 3439) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken18; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod; import javax.enterprise.context.RequestScoped;

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3438 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:12:02 -0400 (Tue, 11 Aug 2009) New Revision: 3438 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor (from rev 3433, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/CityDecorator.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken17; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/CityInterface.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityInterface.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken17; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; interface CityInterface { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java (from rev 3433, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken" }) + @SpecAssertion(section = "6.6.4", id = "aag") + public void testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/NonPassivating.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken17; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; class NonPassivating { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/NonSerializableTest.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonSerializableTest.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken17; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class NonSerializableTest extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation", "ri-broken" }) - @SpecAssertion(section = "6.6.4", id = "aag") - public void testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails() - { - assert false; - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken17/UnderwaterCity.java 2009-08-11 11:56:32 UTC (rev 3433) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java 2009-08-11 12:12:02 UTC (rev 3438) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken17; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor; class UnderwaterCity implements CityInterface {

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3437 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: decoratorWithNonPassivatingInjectedField and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:08:59 -0400 (Tue, 11 Aug 2009) New Revision: 3437 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonSerializableTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonPassivating.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/UnderwaterCity.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/CityDecorator.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityDecorator.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken16; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; import java.io.Serializable; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/CityInterface.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/CityInterface.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken16; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; interface CityInterface { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken" }) + @SpecAssertion(section = "6.6.4", id = "aaf") + public void testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonPassivating.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/NonPassivating.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonPassivating.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken16; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; class NonPassivating { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/NonSerializableTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/NonSerializableTest.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken16; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class NonSerializableTest extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation", "ri-broken" }) - @SpecAssertion(section = "6.6.4", id = "aaf") - public void testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails() - { - assert false; - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/UnderwaterCity.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/UnderwaterCity.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/UnderwaterCity.java 2009-08-11 12:08:59 UTC (rev 3437) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken16; +package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField; class UnderwaterCity implements CityInterface {

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3436 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: managedBeanWithNonSerializableInterceptorClass and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:07:56 -0400 (Tue, 11 Aug 2009) New Revision: 3436 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/NonSerializableTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Interceptor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Kokkola_Broken.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Interceptor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15/Interceptor_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Interceptor_Broken.java 2009-08-11 12:07:56 UTC (rev 3436) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken15; +package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass; import javax.interceptor.AroundInvoke; import javax.interceptor.InvocationContext; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Kokkola_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15/Kokkola_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/Kokkola_Broken.java 2009-08-11 12:07:56 UTC (rev 3436) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken15; +package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass; import java.io.Serializable; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-08-11 12:07:56 UTC (rev 3436) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.managedBeanWithNonSerializableInterceptorClass; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken"}) + @SpecAssertion(section = "6.6.1", id = "bb") + public void testManagedBeanWithNonSerializableInterceptorClassNotOK() + { + assert false; + } +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15/NonSerializableTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/NonSerializableTest.java 2009-08-11 12:07:56 UTC (rev 3436) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken15; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class NonSerializableTest extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation", "ri-broken"}) - @SpecAssertion(section = "6.6.1", id = "bb") - public void testManagedBeanWithNonSerializableInterceptorClassNotOK() - { - assert false; - } -}

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3435 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: unserializableSimpleInjectedIntoPassivatingEnterpriseBean and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:07:30 -0400 (Tue, 11 Aug 2009) New Revision: 3435 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java Log: sort out package names a bit Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/District.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-08-11 12:07:30 UTC (rev 3435) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken10; +package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.enterprise.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/EspooLocal_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java 2009-08-11 12:07:30 UTC (rev 3435) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken10; +package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/Espoo_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-08-11 12:07:30 UTC (rev 3435) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken10; +package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; import javax.ejb.Remove; import javax.ejb.Stateful; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 12:07:30 UTC (rev 3435) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken10; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.testharness.impl.packaging.Packaging; -import org.jboss.testharness.impl.packaging.PackagingType; -import org.testng.annotations.Test; - -@Artifact -(a)Packaging(PackagingType.EAR) -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test -{ - - @Test(groups = { "contexts", "passivation"}) - @SpecAssertion(section = "6.6.4", id = "ba") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() - { - // WBRI-150 - getInstanceByType(EspooLocal_Broken.class); - } - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java (from rev 3433, 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/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 12:07:30 UTC (rev 3435) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test +{ + + @Test(groups = { "contexts", "passivation"}) + @SpecAssertion(section = "6.6.4", id = "ba") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() + { + getInstanceByType(EspooLocal_Broken.class); + } + +}

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3434 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 08:07:00 -0400 (Tue, 11 Aug 2009) New Revision: 3434 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken15/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken16/ Log: Remove

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3433 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-08-11 07:56:32 -0400 (Tue, 11 Aug 2009) New Revision: 3433 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java 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/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java Log: sort out package names a bit, add validation of decorators Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 11:20:39 UTC (rev 3432) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -91,7 +91,7 @@ * @param beanManager the current manager * @param specializedBeans the existing specialized beans */ - private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, List<RIBean<?>> specializedBeans) + private void validateRIBean(RIBean<?> bean, BeanManagerImpl beanManager, Collection<RIBean<?>> specializedBeans) { validateBean(bean, beanManager); if (!(bean instanceof NewSimpleBean<?>) && !(bean instanceof NewEnterpriseBean<?>)) @@ -116,12 +116,16 @@ { throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable decorator: " + decorator); } + for (InjectionPoint ij : decorator.getInjectionPoints()) + { + Bean<?> resolvedBean = beanManager.resolve(beanManager.getInjectableBeans(ij)); + validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); + } } } } } - } /** @@ -184,6 +188,14 @@ } if (Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean)) { + validateInjectionPointPassivationCapable(ij, resolvedBean, beanManager); + } + } + + public void validateInjectionPointPassivationCapable(InjectionPoint ij, Bean<?> resolvedBean, BeanManagerImpl beanManager) + { + if (!ij.isTransient() && !Beans.isPassivationCapableBean(resolvedBean)) + { if (resolvedBean.getScopeType().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?,?>) { throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean); @@ -194,8 +206,17 @@ public void validateDeployment(BeanManagerImpl manager, BeanDeployerEnvironment environment) { - List<RIBean<?>> specializedBeans = new ArrayList<RIBean<?>>(); - for (Bean<?> bean : manager.getBeans()) + validateBeans(manager.getDecorators(), new ArrayList<RIBean<?>>(), manager); + validateBeans(manager.getBeans(), new ArrayList<RIBean<?>>(), manager); + validateEnabledDecoratorClasses(manager); + validateEnabledPolicies(manager); + validateDisposalMethods(environment); + validateBeanNames(manager); + } + + public void validateBeans(Collection<? extends Bean<?>> beans, Collection<RIBean<?>> specializedBeans, BeanManagerImpl manager) + { + for (Bean<?> bean : beans) { if (bean instanceof RIBean<?>) { @@ -206,10 +227,6 @@ validateBean(bean, manager); } } - validateEnabledDecoratorClasses(manager); - validateEnabledPolicies(manager); - validateDisposalMethods(environment); - validateBeanNames(manager); } public void validateBeanNames(BeanManagerImpl beanManager) Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/British.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Cow.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; class Cow { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/CowProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.enterprise.inject.Produces; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.enterprise.inject.IllegalProductException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/MaarianHaminaLocal_Broken.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/Maarianhamina_Broken.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken11; +package org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean; import javax.ejb.Remove; import javax.ejb.Stateful; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBinding.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.inject.Current; import javax.interceptor.AroundInvoke; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/InterceptorType.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; import javax.enterprise.inject.Produces; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBean.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import javax.enterprise.context.SessionScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BakedBinding.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import javax.enterprise.inject.Current; import javax.enterprise.inject.Initializer; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/InterceptorType.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/Violation.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; class Violation { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/ViolationProducer.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter; +package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingInitializerMethodParameter; import javax.enterprise.inject.Produces; 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-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -21,7 +21,6 @@ @SpecAssertion(section = "6.6.4", id = "ba") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() { - // WBRI-150 getInstanceByType(EspooLocal_Broken.class); } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.passivating.broken12; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -@Artifact -(a)ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090625") -public class NonSerializableTest extends AbstractJSR299Test -{ - @Test(groups = { "contexts", "passivation", "ri-broken" }) - @SpecAssertion(section = "6.6.4", id = "aac") - public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() - { - assert false; - } -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java (from rev 3432, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/NonSerializableTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken12/PassivationCapableBeanWithNonPassivatingInterceptorFailsTest.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken12; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion("20090625") +public class PassivationCapableBeanWithNonPassivatingInterceptorFailsTest extends AbstractJSR299Test +{ + @Test(groups = { "contexts", "passivation", "ri-broken" }) + @SpecAssertion(section = "6.6.4", id = "aac") + public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() + { + assert false; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 11:20:39 UTC (rev 3432) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken18/PassivationCapableBeanWIthNonPassivatingInitializerInDecorator.java 2009-08-11 11:56:32 UTC (rev 3433) @@ -13,9 +13,8 @@ @SpecVersion("20090625") public class PassivationCapableBeanWIthNonPassivatingInitializerInDecorator extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "6.6.4", id = "aah") - // WBRI-326 public void testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails() { assert false;

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3432 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/extensions/producer/broken and 5 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-08-11 07:20:39 -0400 (Tue, 11 Aug 2009) New Revision: 3432 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCageInjectionTarget.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/CatFoodDish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogBone.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/LitterBox.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/javax.enterprise.inject.spi.Extension Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Additional tests for ch. 11 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.extensions.producer; + +import javax.enterprise.inject.Current; + +class BirdCage +{ + @Current + protected Bird bird; +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCageInjectionTarget.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCageInjectionTarget.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCageInjectionTarget.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,60 @@ +package org.jboss.jsr299.tck.tests.extensions.producer; + +import java.util.Set; + +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.InjectionTarget; + +class BirdCageInjectionTarget implements InjectionTarget<BirdCage> +{ + private InjectionTarget<BirdCage> wrappedInjectionTarget; + private static boolean injectCalled; + + public BirdCageInjectionTarget(InjectionTarget<BirdCage> originalInjectionTarget) + { + this.wrappedInjectionTarget = originalInjectionTarget; + } + + public void inject(BirdCage instance, CreationalContext<BirdCage> ctx) + { + injectCalled = true; + wrappedInjectionTarget.inject(instance, ctx); + } + + public void postConstruct(BirdCage instance) + { + wrappedInjectionTarget.postConstruct(instance); + } + + public void preDestroy(BirdCage instance) + { + wrappedInjectionTarget.preDestroy(instance); + } + + public void dispose(BirdCage instance) + { + wrappedInjectionTarget.dispose(instance); + } + + public Set<InjectionPoint> getInjectionPoints() + { + return wrappedInjectionTarget.getInjectionPoints(); + } + + public BirdCage produce(CreationalContext<BirdCage> ctx) + { + return wrappedInjectionTarget.produce(ctx); + } + + public static boolean isInjectCalled() + { + return injectCalled; + } + + public static void setInjectCalled(boolean injectCalled) + { + BirdCageInjectionTarget.injectCalled = injectCalled; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/BirdCageInjectionTarget.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java 2009-08-11 11:17:39 UTC (rev 3431) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Cat.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -8,12 +8,13 @@ private static boolean initializerCalled; @Current - protected Bird bird; + protected CatFoodDish foodDish; @Initializer - public Cat(Dog friend) + public Cat(LitterBox litterBox) { initializerCalled = true; + assert litterBox != null; } public static boolean isInitializerCalled() Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/CatFoodDish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/CatFoodDish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/CatFoodDish.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.extensions.producer; + +class CatFoodDish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/CatFoodDish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java 2009-08-11 11:17:39 UTC (rev 3431) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/Dog.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -1,5 +1,7 @@ package org.jboss.jsr299.tck.tests.extensions.producer; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import javax.enterprise.inject.Current; import javax.enterprise.inject.Initializer; @@ -7,10 +9,15 @@ class Dog { private static boolean constructorCalled = false; + private static boolean postConstructCalled; + private static boolean preDestroyCalled; private static DogBed dogBed; public static final String DEFAULT_COLOR = "Brown"; private String color = DEFAULT_COLOR; + + @Current + private DogBone dogBone; public Dog() { @@ -28,6 +35,18 @@ Dog.dogBed = dogBed; } + @PostConstruct + public void postConstruct() + { + postConstructCalled = true; + } + + @PreDestroy + public void preDestroy() + { + preDestroyCalled = true; + } + public static boolean isConstructorCalled() { return constructorCalled; @@ -52,4 +71,34 @@ { return color; } + + public static boolean isPostConstructCalled() + { + return postConstructCalled; + } + + public static void setPostConstructCalled(boolean postConstructCalled) + { + Dog.postConstructCalled = postConstructCalled; + } + + public static boolean isPreDestroyCalled() + { + return preDestroyCalled; + } + + public static void setPreDestroyCalled(boolean preDestroyCalled) + { + Dog.preDestroyCalled = preDestroyCalled; + } + + public DogBone getDogBone() + { + return dogBone; + } + + public void setDogBone(DogBone dogBone) + { + this.dogBone = dogBone; + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogBone.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogBone.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogBone.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.extensions.producer; + +class DogBone +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/DogBone.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/LitterBox.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/LitterBox.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/LitterBox.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.extensions.producer; + +class LitterBox +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/LitterBox.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java 2009-08-11 11:17:39 UTC (rev 3431) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -3,15 +3,21 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.InjectionTarget; +import javax.enterprise.inject.spi.ProcessInjectionTarget; import javax.enterprise.inject.spi.ProcessProducer; import javax.enterprise.inject.spi.Producer; -class ProducerProcessor +class ProducerProcessor implements Extension { private static Producer<Dog> dogProducer; private static Producer<Cat> catProducer; private static Producer<Dog> noisyDogProducer; private static Producer<Dog> quietDogProducer; + private static InjectionTarget<Dog> dogInjectionTarget; + private static AnnotatedType<Dog> dogAnnotatedType; public void processDogProducer(@Observes ProcessProducer<Dog, Dog> producerEvent) { @@ -37,6 +43,13 @@ catProducer = producerEvent.getProducer(); } + public void processDogInjectionTarget(@Observes ProcessInjectionTarget<Dog> injectionTargetEvent) + { + // There a couple, but it does not matter which one is used for the tests + dogInjectionTarget = injectionTargetEvent.getInjectionTarget(); + dogAnnotatedType = injectionTargetEvent.getAnnotatedType(); + } + public static Producer<Dog> getDogProducer() { return dogProducer; @@ -56,4 +69,14 @@ { return catProducer; } + + public static InjectionTarget<Dog> getDogInjectionTarget() + { + return dogInjectionTarget; + } + + public static AnnotatedType<Dog> getDogAnnotatedType() + { + return dogAnnotatedType; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-11 11:17:39 UTC (rev 3431) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -1,6 +1,10 @@ package org.jboss.jsr299.tck.tests.extensions.producer; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.InjectionTarget; import javax.enterprise.inject.spi.Producer; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -8,6 +12,9 @@ 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.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; import org.testng.annotations.Test; /** @@ -17,6 +24,11 @@ * */ @Artifact +@Resources({ + @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +}) +// Must be an integration test as it needs a resource copied to a folder +@IntegrationTest @SpecVersion("20090625") public class ProducerTest extends AbstractJSR299Test { @@ -66,15 +78,15 @@ { Producer<Cat> producer = ProducerProcessor.getCatProducer(); assert producer.getInjectionPoints().size() == 2; - boolean birdIPPresent = false; + boolean injectionPointPresent = false; for (InjectionPoint injectionPoint : producer.getInjectionPoints()) { - if (injectionPoint.getType().equals(Bird.class)) + if (injectionPoint.getType().equals(CatFoodDish.class)) { - birdIPPresent = true; + injectionPointPresent = true; } } - assert birdIPPresent; + assert injectionPointPresent; } @Test(groups = "ri-broken") @@ -175,4 +187,69 @@ assert producer.getInjectionPoints().size() == 1; assert producer.getInjectionPoints().iterator().next().getType().equals(DogBed.class); } + + @SuppressWarnings("unchecked") + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.2", id = "i"), + @SpecAssertion(section = "11.5.6", id = "ba") + }) + public void testInjectionTargetInject() + { + InjectionTarget<Dog> injectionTarget = ProducerProcessor.getDogInjectionTarget(); + Bean<Dog> dogBean = (Bean<Dog>) getCurrentManager().getBeans(Dog.class).iterator().next(); + CreationalContext<Dog> dogCreationalContext = getCurrentManager().createCreationalContext(dogBean); + Dog dog = dogBean.create(dogCreationalContext); + dog.setDogBone(null); + injectionTarget.inject(dog, dogCreationalContext); + assert dog.getDogBone() != null; + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.2", id = "j") + }) + public void testInjectionTargetPostConstruct() + { + InjectionTarget<Dog> injectionTarget = ProducerProcessor.getDogInjectionTarget(); + Dog dog = getInstanceByType(Dog.class, new AnnotationLiteral<Noisy>() {}); + Dog.setPostConstructCalled(false); + injectionTarget.postConstruct(dog); + assert Dog.isPostConstructCalled(); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.2", id = "k") + }) + public void testInjectionTargetPreDestroy() + { + InjectionTarget<Dog> injectionTarget = ProducerProcessor.getDogInjectionTarget(); + Dog dog = getInstanceByType(Dog.class, new AnnotationLiteral<Noisy>() {}); + Dog.setPreDestroyCalled(false); + injectionTarget.preDestroy(dog); + assert Dog.isPreDestroyCalled(); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "bb"), + @SpecAssertion(section = "11.5.6", id = "e") + }) + public void testSettingInjectionTargetReplacesIt() + { + BirdCageInjectionTarget.setInjectCalled(false); + getInstanceByType(BirdCage.class); + assert BirdCageInjectionTarget.isInjectCalled(); + } + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "ab") + }) + public void testGetAnnotatedTypeOnProcessInjectionTarget() + { + assert ProducerProcessor.getDogAnnotatedType() != null; + assert ProducerProcessor.getDogAnnotatedType().getBaseType().equals(Dog.class); + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/Dog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/Dog.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError; + +class Dog +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/Dog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessInjectionTarget; + +class EventProcessor implements Extension +{ + public void processDogInjectionTarget(@Observes ProcessInjectionTarget<Dog> injectionTargetEvent) + { + // Add an exception as a definition error + injectionTargetEvent.addDefinitionError(new RuntimeException("Should abort processing after bean discovery")); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1,40 @@ +package org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; +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.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.testng.annotations.Test; + +/** + * Test for adding a definition error via the ProcessInjectionTarget event. + * + * @author David Allen + * + */ +@Artifact +@Resources({ + @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +}) +// Must be an integration test as it needs a resource copied to a folder +@IntegrationTest +(a)ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") +public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test +{ + + @Test(groups = "ri-broken") + @SpecAssertions({ + @SpecAssertion(section = "11.5.6", id = "da") + }) + public void testAddingDefinitionError() + { + assert false; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/javax.enterprise.inject.spi.Extension (from rev 3422, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/javax.enterprise.inject.spi.Extension) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/javax.enterprise.inject.spi.Extension (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/javax.enterprise.inject.spi.Extension 2009-08-11 11:20:39 UTC (rev 3432) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.extensions.producer.broken.injectionTargetError.EventProcessor Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-11 11:17:39 UTC (rev 3431) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-11 11:20:39 UTC (rev 3432) @@ -4419,8 +4419,9 @@ <text>For a Producer that represents a producer method, |getInjectionPoints()| returns the set of |InjectionPoint| objects representing all parameters of the producer method.</text> </assertion> - <assertion id="h"> + <assertion id="h" testable="false"> <text>The subinterface |javax.enterprise.inject.spi.InjectionTarget| provides operations for performing dependency injection and lifecycle callbacks on an instance of a type.</text> + <note>Statement of intent</note> </assertion> <assertion id="i">

14 years, 8 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3431 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/definition/broken and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-08-11 07:17:39 -0400 (Tue, 11 Aug 2009) New Revision: 3431 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorHallway.java Log: removed unnecessary class, added another decorator test Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorHallway.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorHallway.java 2009-08-11 11:03:29 UTC (rev 3430) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorHallway.java 2009-08-11 11:17:39 UTC (rev 3431) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.tests.context.dependent; - -@Hallway -class InteriorHallway implements Interior -{ - - public void foo() - { - // TODO Auto-generated method stub - - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-08-11 11:17:39 UTC (rev 3431) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@BeansXml("beans.xml") +@SpecVersion("20090625") +public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test +{ + @Test + @SpecAssertion(section="8.2", id="ba") + public void testNonExistantDecoratorClassInBeansXmlNotOK() + { + assert false; + } +} Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/beans.xml 2009-08-11 11:17:39 UTC (rev 3431) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <decorator>com.acme.NonExistantDecoratorClass</decorator> + </decorators> +</beans>

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits August 2009