Author: shane.bryzak(a)jboss.com Date: 2009-03-23 22:57:26 -0400 (Mon, 23 Mar 2009) New Revision: 2168 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java Log: implemented tests for 4.1.daa, 4.1.dba, 4.1.dca, 4.1.dda Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Chihuahua.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +class Chihuahua extends ShortHairedDog +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MexicanChihuahua.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +class MexicanChihuahua extends Chihuahua +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/ShortHairedDog.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@AnimalStereotype +@SessionScoped +class ShortHairedDog implements Animal, Serializable +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-03-24 02:26:39 UTC (rev 2167) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -5,6 +5,7 @@ import javax.context.ApplicationScoped; import javax.context.Dependent; import javax.context.RequestScoped; +import javax.context.SessionScoped; import javax.inject.AnnotationLiteral; import javax.inject.Production; import javax.inject.manager.Bean; @@ -165,5 +166,19 @@ { assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class); } + + @Test + @SpecAssertion(section = "4.1", id = "daa") + public void testStereotypeScopeIsOverriddenByInheritedScope() + { + assert getCurrentManager().resolveByType(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "dca") + public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() + { + assert getCurrentManager().resolveByType(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class); + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Chihuahua.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class Chihuahua extends ShortHairedDog implements ChihuahuaLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; + +import javax.ejb.Local; + +@Local +public interface ChihuahuaLocal +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-03-24 02:26:39 UTC (rev 2167) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; import javax.context.RequestScoped; +import javax.context.SessionScoped; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -32,4 +33,18 @@ { assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } + + @Test + @SpecAssertion(section = "4.1", id = "dba") + public void testStereotypeScopeIsOverriddenByInheritedScope() + { + assert getCurrentManager().resolveByType(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "dda") + public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() + { + assert getCurrentManager().resolveByType(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class MexicanChihuahua extends Chihuahua implements MexicanChihuahuaLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; + +import javax.ejb.Local; + +@Local +public interface MexicanChihuahuaLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java 2009-03-24 02:57:26 UTC (rev 2168) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@AnimalStereotype +@SessionScoped +class ShortHairedDog implements Animal, Serializable +{ + +}