Author: dallen6 Date: 2009-02-16 12:22:31 -0500 (Mon, 16 Feb 2009) New Revision: 1540 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Landowner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Cow_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Donkey_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmEquipment.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Yard.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Refactored the simple bean specialization tests. Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Cow_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Cow_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Cow_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -class Cow_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Donkey_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Donkey_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Donkey_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -class Donkey_Broken implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmEquipment.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmEquipment.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.annotation.Named; -import javax.ejb.Stateful; - - -@Named("plough") -@Stateful -class FarmEquipment -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.annotation.Named; -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -@Named -class FarmYard_Broken extends Yard -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -class FishFarmer_Broken extends Farmer -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes -class OrganicFarmer_Broken extends Farmer -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes @AnotherDeploymentType -class SheepFarmer_Broken extends Farmer -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -3,14 +3,14 @@ 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.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.testng.annotations.Test; @@ -19,125 +19,68 @@ * Spec version: PRD2 * */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) public class SimpleBeanSpecializationTest extends AbstractDeclarativeTest { - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + + private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() { - List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(); - deploymentTypes.addAll(getStandardDeploymentTypes()); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; + }; + @SuppressWarnings("unchecked") @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "unknown"), - @SpecAssertion(section = "3.2.7", id = "unknown") - }) + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "c"), @SpecAssertion(section = "3.2.7", id = "a") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { - deployBeans(LazyFarmer.class); assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2; - assert annotationSetMatches( getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); + assert annotationSetMatches(getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class); } - + @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "unknown"), - @SpecAssertion(section = "3.2.7", id = "unknown") - }) + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "d"), @SpecAssertion(section = "3.2.7", id = "a") }) public void testSpecializingBeanHasNameOfSpecializedBean() { - deployBeans(LazyFarmer.class); assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1; assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class); assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer"); } - - @Test(expectedExceptions=DefinitionException.class) - @SpecAssertion(section = "4.3.1", id = "unknown") - public void testSpecializingAndSpecializedBeanHasName() - { - deployBeans(FarmYard_Broken.class); - } - + @Test - @SpecAssertions({ - @SpecAssertion(section = "4.3.1", id = "unknown"), - @SpecAssertion(section = "3.2.7", id = "unknown") - }) + @SpecAssertions( { @SpecAssertion(section = "4.3.1", id = "f"), @SpecAssertion(section = "3.2.7", id = "b") }) public void testSpecializedBeanNotInstantiated() throws Exception { - deployBeans(LazyFarmer.class, Farmer.class); new RunInDependentContext() { - + @Override protected void execute() throws Exception { Farmer farmer = getCurrentManager().getInstanceByType(Farmer.class, LANDOWNER_LITERAL); assert farmer.getClassName().equals(LazyFarmer.class.getName()); } - + }.run(); } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.1", id = "unknown") - public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() - { - deployBeans(OrganicFarmer_Broken.class); - } - - @Test @SpecAssertion(section="4.3.1", id = "unknown") + + @Test( groups = "broken" ) + @SpecAssertion(section = "4.3.1", id = "g") public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { - deployBeans(Office.class, Building.class); +// deployBeans(Office.class, Building.class); new RunInDependentContext() { - + @Override protected void execute() throws Exception { assert getCurrentManager().resolveByType(Waste.class).size() == 1; assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName()); } - + }.run(); } - - @Test(expectedExceptions=InconsistentSpecializationException.class) - @SpecAssertion(section="4.3.1", id = "unknown") - public void testTwoBeansSpecializeTheSameBean() - { - deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "unknown") - public void testSpecializingClassDirectlyExtendsEnterpriseBean() - { - deployBeans(FarmEquipment.class, Tractor_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "unknown") - public void testSpecializingClassDirectlyExtendsNothing() - { - deployBeans(Cow_Broken.class); - } - - @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "unknown") - public void testSpecializingClassImplementsInterfaceAndExtendsNothing() - { - deployBeans(Donkey_Broken.class); - } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Tractor_Broken.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Tractor_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -class Tractor_Broken extends FarmEquipment -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Yard.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Yard.java 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Yard.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.inheritance.specialization.simple; - -import javax.annotation.Named; - -@Named("backyard") -class Yard -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; + +import javax.annotation.Named; +import javax.ejb.Stateful; + + +@Named("plough") +@Stateful +class FarmEquipment +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +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 SpecializingBeanExtendsEnterpriseBeanTest +{ + @Test(groups = { "specialization" }) + @SpecAssertion(section = "3.2.7", id = "a") + public void testSpecializingClassDirectlyExtendsEnterpriseBean() + { + } + + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; + +import javax.inject.Specializes; + +import org.jboss.jsr299.tck.unit.implementation.producer.field.AnotherDeploymentType; + +@Specializes +@AnotherDeploymentType +class Tractor_Broken extends FarmEquipment +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/AnotherDeploymentType.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FarmYard_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; + +import javax.annotation.Named; +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +@Named +class FarmYard_Broken extends Yard +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/FarmYard_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +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 SpecializingAndSpecializedBeanHasNameTest +{ + @Test + @SpecAssertion(section = "4.3.1", id = "e") + public void testSpecializingAndSpecializedBeanHasName() + { + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Yard.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names; + +import javax.annotation.Named; + +@Named("backyard") +class Yard +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/Yard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Animal.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Animal.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/AnotherDeploymentType.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Donkey_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class Donkey_Broken implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +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 SpecializingBeanImplementsInterfaceOnly +{ + @Test(groups = { "specialization" }) + @SpecAssertion(section = "3.2.7", id = "a") + public void testSpecializingClassImplementsInterfaceAndExtendsNothing() + { + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/AnotherDeploymentType.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Cow_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class Cow_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +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 SpecializingBeanExtendsNothingTest +{ + @Test(groups = { "specialization" }) + @SpecAssertion(section = "3.2.7", id = "a") + public void testSpecializingClassDirectlyExtendsNothing() + { + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Farmer.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Farmer.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; + +import javax.annotation.Named; + +@Landowner +@Named +class Farmer +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Landowner.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/Landowner.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; + +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 Landowner +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/OrganicFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/OrganicFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; + +import javax.inject.Specializes; + +@Specializes +class OrganicFarmer_Broken extends Farmer +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.precedence; + +import javax.inject.InconsistentSpecializationException; + +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 SpecializingBeanWithLowerPrecedenceTest +{ + @Test + public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean() + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/AnotherDeploymentType.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Farmer.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Farmer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Farmer.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +import javax.annotation.Named; + + +@Landowner +@Named +class Farmer +{ + + public String getClassName() + { + return Farmer.class.getName(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/FishFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +import javax.inject.Specializes; + +import org.jboss.jsr299.tck.unit.implementation.producer.field.AnotherDeploymentType; + +@Specializes +@AnotherDeploymentType +class FishFarmer_Broken extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Landowner.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/Landowner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Landowner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/Landowner.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +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 Landowner +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java (from rev 1539, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SheepFarmer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +import javax.inject.Specializes; + +@Specializes @AnotherDeploymentType +class SheepFarmer_Broken extends Farmer +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/SheepFarmer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two; + +import javax.inject.InconsistentSpecializationException; + +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 TwoSpecializingBeansForOneSpecializedTest +{ + @Test + public void testTwoBeansSpecializeTheSameBean() + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml (from rev 1537, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.names"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/names/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend1"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend1/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.noextend2"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/noextend2/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.two"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-16 13:38:05 UTC (rev 1539) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-16 17:22:31 UTC (rev 1540) @@ -1850,14 +1850,22 @@ </assertion> <assertion id="d"> - <text>If a bean X specializes a lower-priority bean Y with a name, the name of X is the same as the name of Y. If X declares a name explicitly, a DefinitionException is thrown by the container at deployment time</text> + <text>If a bean X specializes a lower-priority bean Y with a name, the name of X is the same as the name of Y.</text> </assertion> <assertion id="e"> - <text>When an enabled bean specializes a lower-priority bean, we can be certain that the lower-priority bean is never instantiated or called by the container. Even if the lower-priority bean defines a producer method, the method will be called upon an instance of the first bean</text> + <text>If a bean X specializes a lower-priority bean Y with a name, and X declares a name explicitly, a DefinitionException is thrown by the container at deployment time</text> </assertion> <assertion id="f"> + <text>When an enabled bean specializes a lower-priority bean, we can be certain that the lower-priority bean is never instantiated or called by the container.</text> + </assertion> + + <assertion id="g"> + <text>Even if the lower-priority bean defines a producer method, the method will be called upon an instance of the specializing bean</text> + </assertion> + + <assertion id="h"> <text>Specialization applies only to simple beans, as defined in Section 3.2.7, "Specializing a simple bean", session beans, as defined in Section 3.3.7, "Specializing a session bean" and producer methods, as defined in Section 3.4.5, "Specializing a producer method".</text> </assertion> </section>