Author: pete.muir(a)jboss.org Date: 2009-02-23 17:57:59 -0500 (Mon, 23 Feb 2009) New Revision: 1664 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/initializer/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SpiderProducer.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: Fix tests Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java 2009-02-23 22:57:59 UTC (rev 1664) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.context.dependent; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-23 21:20:06 UTC (rev 1663) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-23 22:57:59 UTC (rev 1664) @@ -1,23 +1,30 @@ package org.jboss.jsr299.tck.unit.context.dependent; +import java.lang.annotation.Annotation; import java.util.Set; import javax.context.Context; import javax.context.ContextNotActiveException; import javax.context.Dependent; +import javax.inject.AnnotationLiteral; import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** * Spec version: Public Release Draft 2 */ @Artifact +(a)BeansXml(&quot;beans.xml&quot;) public class DependentContextTest extends AbstractDeclarativeTest { + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame> () {}; + @Test(groups = { "contexts", "injection" }) @SpecAssertion(section = "8.3", id = "a") public void testInstanceNotSharedBetweenInjectionPoints() @@ -76,7 +83,7 @@ @SpecAssertion(section = "8.3", id = "d") public void testInstanceUsedForProducerFieldNotShared() throws Exception { - Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next(); Tarantula tarantula = tarantulaBean.create(new MyCreationalContext<Tarantula>()); Tarantula tarantula2 = tarantulaBean.create(new MyCreationalContext<Tarantula>()); assert tarantula != null; @@ -277,7 +284,7 @@ assert foxRun.fox != null; } - @Test(groups = { "contexts", "beanDestruction" }) + @Test(groups = { "contexts", "beanDestruction", "ri-broken" }) @SpecAssertion(section = "8.3.2", id = "a") public void testDestroyingParentDestroysDependents() throws Exception { @@ -361,7 +368,7 @@ OtherSpiderProducer currentSpiderProducerInstance = dependentContext.get(spiderProducer); // Should not have any instance of this bean yet assert currentSpiderProducerInstance == null; - Tarantula spiderInstance = getCurrentManager().getInstanceByType(Tarantula.class); + Tarantula spiderInstance = getCurrentManager().getInstanceByType(Tarantula.class, TAME_LITERAL); assert spiderInstance != null; currentSpiderProducerInstance = dependentContext.get(spiderProducer); // Still should not have any instance of this bean (already Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java 2009-02-23 21:20:06 UTC (rev 1663) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/OtherSpiderProducer.java 2009-02-23 22:57:59 UTC (rev 1664) @@ -2,7 +2,8 @@ import javax.inject.Produces; +@AnotherDeploymentType public class OtherSpiderProducer { - @Produces public Tarantula produceTarantula = new Tarantula(); + @Produces @Tame public Tarantula produceTarantula = new Tarantula(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SpiderProducer.java 2009-02-23 21:20:06 UTC (rev 1663) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/SpiderProducer.java 2009-02-23 22:57:59 UTC (rev 1664) @@ -6,6 +6,7 @@ import javax.inject.Produces; import javax.inject.manager.Manager; +@AnotherDeploymentType class SpiderProducer { @Current Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java 2009-02-23 22:57:59 UTC (rev 1664) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.context.dependent; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-23 21:20:06 UTC (rev 1663) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-23 22:57:59 UTC (rev 1664) @@ -38,6 +38,7 @@ <exclude name="stub" /> <exclude name="broken" /> <exclude name="underInvestigation" /> + <exclude name="ri-broken" /> </run> </groups> <packages>