Author: shane.bryzak(a)jboss.com Date: 2009-03-23 22:08:18 -0400 (Mon, 23 Mar 2009) New Revision: 2165 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollieLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java Log: implemented tests for 4.1.bb, 4.1.bd Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollie.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class BorderCollie extends Dog implements BorderCollieLocal +{ + +} \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollieLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollieLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BorderCollieLocal.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.ejb.Local; + +@Local +public interface BorderCollieLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Dog.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.context.RequestScoped; + +@RequestScoped +class Dog +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.ejb.Local; + +@Local +public interface EnglishBorderCollieLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-03-24 02:08:18 UTC (rev 2165) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.definition.scope.enterprise; + +import javax.context.RequestScoped; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test +{ + @Test @SpecAssertion(section="4.1", id = "bb") + public void testScopeTypeDeclaredInheritedIsInherited() throws Exception + { + assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + } + + @Test + @SpecAssertion(section = "4.1", id = "bd") + public void testScopeTypeDeclaredInheritedIsIndirectlyInherited() + { + assert getCurrentManager().resolveByType(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); + } +}