Author: dallen6 Date: 2009-05-13 17:19:31 -0400 (Wed, 13 May 2009) New Revision: 2685 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PreferredChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java Log: A couple more tests and minor changes. Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-05-11 22:09:53 UTC (rev 2684) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -177,7 +177,8 @@ @Test @SpecAssertions({ @SpecAssertion(section="11.6", id="b"), - @SpecAssertion(section="11.6", id="m") + @SpecAssertion(section="11.6", id="m"), + @SpecAssertion(section="11.6", id="d") }) public void testBeanBelongingToParentActivityBelongsToChildActivity() { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Animal.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Animal.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Deadliest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Deadliest.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +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 Deadliest +{ + +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlySpider.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DeadlySpider.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +class DefangedTarantula extends Tarantula +{ + @Override public int getDeathsCaused() { return 0; } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class DisposalMethodsByBindingTest extends AbstractJSR299Test +{ + private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {}; + + @Test(groups = { "broken" }) + @SpecAssertion(section = "2.3.6", id = "c") + public void testBindingTypesAppliedToDisposalMethodParameters() + { + //TODO Fix this test copied from proposal method tests which is not working here + Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); + Tarantula instance = getCurrentManager().getInstance(tarantula); + assert instance.getDeathsCaused() == 1; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodsByBindingTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Spider.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Spider.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + + +class Spider implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/SpiderProducer.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +import javax.inject.Current; +import javax.inject.Produces; + +class SpiderProducer +{ + + @Produces @Tame public Tarantula produceTameTarantula() + { + return new DefangedTarantula(); + } + + @Produces @Deadliest public Tarantula producesDeadliestTarantula(@Tame Tarantula tameTarantula, + @Current Tarantula tarantula) + { + return tameTarantula.getDeathsCaused() >= tarantula.getDeathsCaused() ? + tameTarantula : tarantula; + } + + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tame.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tarantula.java (from rev 2684, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/Tarantula.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition; + +class Tarantula extends Spider implements DeadlySpider +{ + public int getDeathsCaused() { return 1; } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenInterface.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +interface ChickenInterface +{ + public String getName(); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/ChickenInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-05-11 22:09:53 UTC (rev 2684) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -17,6 +17,19 @@ public class InitializerMethodTest extends AbstractJSR299Test { + @Test(groups = { "initializerMethod" }) + @SpecAssertions({ + @SpecAssertion(section = "2.3.6", id = "b"), + @SpecAssertion(section = "3.9", id = "d") + }) + public void testBindingTypeOnInitializerParameter() + { + PremiumChickenHutch hutch = getCurrentManager().getInstanceByType(PremiumChickenHutch.class); + assert hutch.getChicken().getName().equals("Preferred"); + StandardChickenHutch anotherHutch = getCurrentManager().getInstanceByType(StandardChickenHutch.class); + assert anotherHutch.getChicken().getName().equals("Standard"); + } + @Test(groups = { "stub", "initializerMethod", "servlet", "integration" }) @SpecAssertion(section = "3.9", id = "d") public void testInitializerMethodCalledOnServlet() Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +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.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@BindingType +@interface Preferred +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/Preferred.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PreferredChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PreferredChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PreferredChicken.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +@Preferred +class PreferredChicken implements ChickenInterface +{ + + public String getName() + { + return "Preferred"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PreferredChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.inject.Initializer; + +class PremiumChickenHutch +{ + private ChickenInterface chicken; + + @Initializer + public void setChicken(@Preferred ChickenInterface chicken) + { + this.chicken = chicken; + } + + public ChickenInterface getChicken() + { + return chicken; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/PremiumChickenHutch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChicken.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +@StandardVariety +class StandardChicken implements ChickenInterface +{ + + public String getName() + { + return "Standard"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +import javax.inject.Initializer; + +class StandardChickenHutch +{ + private ChickenInterface chicken; + + @Initializer + public void setChicken(@StandardVariety ChickenInterface chicken) + { + this.chicken = chicken; + } + + public ChickenInterface getChicken() + { + return chicken; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardChickenHutch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.implementation.initializer; + +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.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@BindingType +@interface StandardVariety +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/StandardVariety.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-11 22:09:53 UTC (rev 2684) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-05-13 21:19:31 UTC (rev 2685) @@ -17,6 +17,7 @@ { @Test(groups = { "ri-broken", "xml" }) @SpecAssertions({ + @SpecAssertion(section="2.3.2", id="c"), @SpecAssertion(section="9.4", id="a") }) public void testBindingTypeFromXML()