[webbeans-commits] Webbeans SVN: r1651 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method and 12 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-22 18:29:25 -0500 (Sun, 22 Feb 2009) New Revision: 1651 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/abstractClass/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/MallShop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Pupil.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/School.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java Log: @Artifactify Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class Bookshop_Broken extends Shop -{ - - @Override @Specializes @Produces @AnotherDeploymentType - public Product getExpensiveGift() - { - return new Product(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class ClothesShop_Broken extends Shop -{ - - @Specializes @Produces - public Product getExpensiveGift() - { - // TODO Auto-generated method stub - return super.getExpensiveGift(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class FurnitureShop_Broken extends Shop -{ - - @Specializes @Produces @AnotherDeploymentType - public static Product getChair() - { - return new Product(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.annotation.Named; -import javax.inject.Produces; -import javax.inject.Specializes; - -class HighSchool_Broken extends School -{ - - @Override @Produces @Specializes @AnotherDeploymentType @Named - public Pupil getStarPupil() - { - return super.getStarPupil(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/MallShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/MallShop.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/MallShop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -class MallShop extends Shop -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class PictureShop_Broken extends Shop -{ - - @Override @Produces @Specializes @AnotherDeploymentType - public Product getExpensiveGift() - { - // TODO Auto-generated method stub - return super.getExpensiveGift(); - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -3,35 +3,26 @@ import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches; import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; import javax.inject.AnnotationLiteral; -import javax.inject.DefinitionException; -import javax.inject.InconsistentSpecializationException; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; 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: PRD2 * */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) public class ProducerMethodSpecializationTest extends AbstractDeclarativeTest { private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral<Expensive>() {}; - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(); - deploymentTypes.addAll(getStandardDeploymentTypes()); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } @Test @SpecAssertions({ @@ -40,7 +31,6 @@ }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - deployBeans(JewelryShop.class); assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).size() == 1; assert getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 2; assert annotationSetMatches( getCurrentManager().resolveByType(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class); @@ -53,18 +43,10 @@ }) public void testSpecializingBeanHasNameOfSpecializedBean() { - deployBeans(JewelryShop.class); assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1; assert getCurrentManager().resolveByType(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift"); } - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section = "4.3.1", id = "d") - public void testSpecializingAndSpecializedBeanHasName() - { - deployBeans(HighSchool_Broken.class); - } - @Test @SpecAssertions({ @SpecAssertion(section = "4.3.1", id = "f"), @@ -72,7 +54,6 @@ }) public void testSpecializedBeanNotInstantiated() throws Exception { - deployBeans(JewelryShop.class, Shop.class); new RunInDependentContext() { @@ -85,40 +66,5 @@ }.run(); } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.1", id = "a") - public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() - { - deployBeans(ClothesShop_Broken.class); - } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.3", id = "a") - public void testTwoBeansSpecializeTheSameBean() - { - deployBeans(PictureShop_Broken.class, Bookshop_Broken.class); - } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4.5", id = "b") - public void testSpecializedStaticMethod() - { - deployBeans(FurnitureShop_Broken.class); - } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4.5", id = "c") - public void testSpecializedMethodDoesNotOverrideAnotherProducerMethod() - { - deployBeans(FurnitureShop_Broken.class); - } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4.5", id = "c") - public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod() - { - deployBeans(ShoeShop_Broken.class); - } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Pupil.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Pupil.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Pupil.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -class Pupil -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/School.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/School.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.annotation.Named; -import javax.inject.Produces; - -class School -{ - - @Produces @Named("bestPupil") - public Pupil getStarPupil() - { - return new Pupil(); - } - - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java 2009-02-22 23:03:11 UTC (rev 1650) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method; - -import javax.inject.Produces; -import javax.inject.Specializes; - -class ShoeShop_Broken extends MallShop -{ - - @Override @Produces @Specializes @AnotherDeploymentType - public Product getExpensiveGift() - { - return super.getExpensiveGift(); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +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 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +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 Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +import javax.inject.DefinitionException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class IndirectOverrideTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section="3.4.5", id = "c") + public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +class MallShop extends Shop +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/MallShop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +class Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Product.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ShoeShop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +import javax.inject.Produces; +import javax.inject.Specializes; + +class ShoeShop_Broken extends MallShop +{ + + @Override @Produces @Specializes @AnotherDeploymentType + public Product getExpensiveGift() + { + return super.getExpensiveGift(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/ShoeShop_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.indirectOverride; + +import javax.annotation.Named; +import javax.inject.Produces; + + +class Shop +{ + + @Produces @Expensive @Named + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ClothesShop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; + +import javax.inject.Produces; +import javax.inject.Specializes; + +class ClothesShop_Broken extends Shop +{ + + @Specializes @Produces + public Product getExpensiveGift() + { + // TODO Auto-generated method stub + return super.getExpensiveGift(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/ClothesShop_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; + +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 Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; + +class Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Product.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; + +import javax.annotation.Named; +import javax.inject.Produces; + + +class Shop +{ + + @Produces @Expensive @Named + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.lowerprecedence; + +import javax.inject.InconsistentSpecializationException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +public class SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section="4.3.1", id = "a") + public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +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 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +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 Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/FurnitureShop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/FurnitureShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +import javax.inject.Produces; +import javax.inject.Specializes; + + +class FurnitureShop_Broken extends Shop +{ + + @Specializes @Produces @AnotherDeploymentType + public static Product getChair() + { + return new Product(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +class Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Product.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +import javax.annotation.Named; +import javax.inject.Produces; + + +class Shop +{ + + @Produces @Expensive @Named + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod; + +import javax.inject.DefinitionException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class SpecializesStaticMethodTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section="3.4.5", id = "b") + public void testSpecializedStaticMethod() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; + +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 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/HighSchool_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; + +import javax.annotation.Named; +import javax.inject.Produces; +import javax.inject.Specializes; + +class HighSchool_Broken extends School +{ + + @Override @Produces @Specializes @AnotherDeploymentType @Named + public Pupil getStarPupil() + { + return super.getStarPupil(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; + +class Pupil +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/Pupil.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; + +import javax.annotation.Named; +import javax.inject.Produces; + +class School +{ + + @Produces @Named("bestPupil") + public Pupil getStarPupil() + { + return new Pupil(); + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/School.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName; + +import javax.inject.DefinitionException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section = "4.3.1", id = "d") + public void testSpecializingAndSpecializedBeanHasName() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +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 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/Bookshop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +import javax.inject.Produces; +import javax.inject.Specializes; + +class Bookshop_Broken extends Shop +{ + + @Override @Specializes @Produces @AnotherDeploymentType + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Bookshop_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +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 Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/PictureShop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +import javax.inject.Produces; +import javax.inject.Specializes; + +class PictureShop_Broken extends Shop +{ + + @Override @Produces @Specializes @AnotherDeploymentType + public Product getExpensiveGift() + { + // TODO Auto-generated method stub + return super.getExpensiveGift(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/PictureShop_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +class Product +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Product.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +import javax.annotation.Named; +import javax.inject.Produces; + + +class Shop +{ + + @Produces @Expensive @Named + public Product getExpensiveGift() + { + return new Product(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/Shop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean; + +import javax.inject.InconsistentSpecializationException; + +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.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(InconsistentSpecializationException.class) +public class TwoBeansSpecializeTheSameBeanTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section="4.3.3", id = "a") + public void testTwoBeansSpecializeTheSameBean() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.indirectOverride"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/indirectOverride/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.specializesStaticMethod"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializesStaticMethod/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.specializingAndSpecializedBeanHaveSameName"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml 2009-02-22 23:29:25 UTC (rev 1651) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain