Author: shane.bryzak(a)jboss.com Date: 2009-03-23 23:19:33 -0400 (Mon, 23 Mar 2009) New Revision: 2169 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Bovine.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/JerseyCow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bovine.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Cow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/CowLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBullLocal.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml Log: implemented tests for 4.1.dab, 4.1.dcb, 4.1.dbb, 4.1.ddb Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Bovine.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Bovine.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Bovine.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +@HornedMammalStereotype +@AnotherDeploymentType +class Bovine implements Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Cow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/Cow.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class Cow extends Bovine +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-24 02:57:26 UTC (rev 2168) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -150,4 +150,20 @@ assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getDeploymentType().equals(InheritedDeploymentType.class); } + @Test + @SpecAssertion(section = "4.1", id = "dab") + public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() + { + assert getCurrentManager().resolveByType(Cow.class).size() == 1; + assert getCurrentManager().resolveByType(Cow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "dcb") + public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() + { + assert getCurrentManager().resolveByType(JerseyCow.class).size() == 1; + assert getCurrentManager().resolveByType(JerseyCow.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/JerseyCow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/JerseyCow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/JerseyCow.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment; + +class JerseyCow extends Cow +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Animal.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +interface Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bovine.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bovine.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bovine.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +@HornedMammalStereotype +@AnotherDeploymentType +class Bovine implements Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bull.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Bull.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +class Bull extends Bovine +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Cow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Cow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Cow.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class Cow extends Bovine implements CowLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/CowLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/CowLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/CowLocal.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +import javax.ejb.Local; + +@Local +public interface CowLocal +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-03-24 02:57:26 UTC (rev 2168) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -30,4 +30,20 @@ assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).size() == 1; assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } + + @Test + @SpecAssertion(section = "4.1", id = "dbb") + public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() + { + assert getCurrentManager().resolveByType(CowLocal.class).size() == 1; + assert getCurrentManager().resolveByType(CowLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "ddb") + public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() + { + assert getCurrentManager().resolveByType(JerseyBullLocal.class).size() == 1; + assert getCurrentManager().resolveByType(JerseyBullLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedAnimalDeploymentType.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +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 HornedAnimalDeploymentType +{ + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/HornedMammalStereotype.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@HornedAnimalDeploymentType +@interface HornedMammalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBull.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBull.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class JerseyBull extends Bull implements JerseyBullLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBullLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBullLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/JerseyBullLocal.java 2009-03-24 03:19:33 UTC (rev 2169) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.enterprise; + +import javax.ejb.Local; + +@Local +public interface JerseyBullLocal +{ + +} Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml 2009-03-24 02:57:26 UTC (rev 2168) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/beans.xml 2009-03-24 03:19:33 UTC (rev 2169) @@ -4,5 +4,6 @@ <Standard /> <Production /> <test:AnotherDeploymentType /> + <test:HornedAnimalDeploymentType /> </Deploy> </Beans>