Author: pete.muir(a)jboss.org Date: 2009-02-21 16:10:30 -0500 (Sat, 21 Feb 2009) New Revision: 1622 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java Log: Convert tests to @Artifact Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class AnimalFarmer extends Farmer<Animal> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 BindingTypeWithBindingAnnotationMember_Broken -{ - - Expensive expensive(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 BindingTypeWithBindingArrayTypeMember_Broken -{ - - boolean[] bool(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 Chunky -{ - - boolean realChunky(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -class Cod implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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.annotation.NonBinding; -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Expensive -{ - - boolean veryExpensive(); - - @NonBinding - int cost(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Production; - -@Production -class Farmer<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -final class FinalTuna_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Haddock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -@Expensive(cost=50, veryExpensive=true) -@Whitefish -class Halibut implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,101 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import java.lang.annotation.Annotation; -import java.util.List; - -import javax.inject.AmbiguousDependencyException; -import javax.inject.AnnotationLiteral; -import javax.inject.DuplicateBindingTypeException; -import javax.inject.TypeLiteral; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.literals.CurrentBinding; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class InstantiationByTypeTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - @Test(groups={"resolution", "beanLifecycle"}) - @SpecAssertion(section="5.7.2", id = "h") - public void testCurrentBindingTypeAssumed() - { - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - assert getCurrentManager().getInstanceByType(Tuna.class) != null; - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "ib") - public void testParameterizedTypeWithWildcardParameter() - { - getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "ia") - public <T> void testParameterizedTypeWithTypeParameter() - { - getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); - } - - - @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) - @SpecAssertion(section="5.7.2", id = "j") - public void testDuplicateBindingTypesUsed() - { - getCurrentManager().getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding()); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "k") - public void testNonBindingTypeUsed() - { - getCurrentManager().getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral()); - } - - @Test(expectedExceptions=AmbiguousDependencyException.class) - @SpecAssertion(section="5.7.2", id = "n") - public void testAmbiguousDependencies() throws Exception - { - Bean<Cod> codBean = createSimpleBean(Cod.class); - Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); - Bean<Sole> soleBean = createSimpleBean(Sole.class); - getCurrentManager().addBean(codBean); - getCurrentManager().addBean(salmonBean); - getCurrentManager().addBean(soleBean); - getCurrentManager().getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){}); - } - - @Test(expectedExceptions=UnsatisfiedDependencyException.class) - @SpecAssertion(section="5.7.2", id = "m") - public void testUnsatisfiedDependencies() throws Exception - { - deployBeans(Cod.class, Salmon.class, Sole.class);; - getCurrentManager().getInstanceByType(Tuna.class, new CurrentBinding()); - } - - @Test(expectedExceptions=UnproxyableDependencyException.class) - @SpecAssertion(section="outdated", id = "outdated") - public void testUnproxyableDependencies() throws Exception - { - deployBeans(FinalTuna_Broken.class); - getCurrentManager().getInstanceByType(FinalTuna_Broken.class, new AnnotationLiteral<Whitefish>(){}); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class ParameterizedBean_Broken<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; - -@AnotherDeploymentType -@Whitefish -@Named("whitefish") -final class Plaice implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -@Expensive(cost=60, veryExpensive=true) -@Whitefish -class RoundWhitefish implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Salmon implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -interface ScottishFish extends Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Production; - -@Production -class ScottishFishFarmer extends Farmer<ScottishFish> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; -import javax.inject.Production; - -@Production -@RequestScoped -class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Named("whitefish") -class Sole implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Produces; - -@AnotherDeploymentType -class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces public String[] getStrings() - { - return new String[0]; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 Whitefish -{ - -}