Author: shane.bryzak(a)jboss.com Date: 2009-08-11 06:46:46 -0400 (Tue, 11 Aug 2009) New Revision: 3429 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java Log: decorator tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 10:26:56 UTC (rev 3428) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -364,8 +364,8 @@ room.foo(); - assert InteriorDecorator.getInstances().size() > 0; assert InteriorDecorator.getInstances().size() == 1; + roomBean.destroy(room, roomCreationalContext); assert InteriorDecorator.isDestroyed(); Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator; + +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; + +/** + * + * @author Shane Bryzak + */ +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +(a)BeansXml(&quot;beans.xml&quot;) +@SpecVersion("20090625") +public class DecoratorCanNotDecorateAnotherDecoratorTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertion(section="8", id="a") + public void testDecoratorCanNotDecorateAnotherDecorator() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator; + +class Foo +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +@Decorator +class FooDecorator +{ + @Decorates Foo foo; +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +@Decorator +class FooDecoratorDecorator +{ + @Decorates FooDecorator otherDecorator; +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml; + +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; + +/** + * + * @author Shane Bryzak + */ +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +(a)BeansXml(&quot;beans.xml&quot;) +@SpecVersion("20090625") +public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test +{ + @Test(groups = { "ri-broken" }) + @SpecAssertion(section="8.2", id="bc") + public void testDecoratorListedTwiceInBeansXmlNotOK() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml; + +class Present +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +@Decorator +class PresentDecorator +{ + @Decorates Present present; +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates; + +class ChristmasTree +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates; + +import javax.decorator.Decorates; + +class Elf +{ + @Decorates ChristmasTree tree; +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates; + +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.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +/** + * + * @author Shane Bryzak + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +@SpecVersion("20090625") +public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test +{ + @Test + @SpecAssertion(section="8.1.2", id="cg") + public void testNonDecoratorWithDecoratesAnnotationNotOK() + { + assert false; + } +} Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,7 @@ +<beans> + <decorators> + <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecorator</decorator> + <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecoratorDecorator</decorator> + </decorators> + +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml 2009-08-11 10:46:46 UTC (rev 3429) @@ -0,0 +1,7 @@ +<beans> + <decorators> + <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator> + <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator> + </decorators> + +</beans>