[webbeans-commits] Webbeans SVN: r2049 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.

Author: dallen6 Date: 2009-03-16 15:15:19 -0400 (Mon, 16 Mar 2009) New Revision: 2049 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Dog.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/DogRemote.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java Log: New test and mappings for some EJB bean definition tests. Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Dog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Dog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Dog.java 2009-03-16 19:15:19 UTC (rev 2049) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +public class Dog +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Dog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/DogRemote.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/DogRemote.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/DogRemote.java 2009-03-16 19:15:19 UTC (rev 2049) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.definition; + +import javax.ejb.Remote; + +@Remote +public interface DogRemote +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/DogRemote.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-03-16 18:30:10 UTC (rev 2048) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-03-16 19:15:19 UTC (rev 2049) @@ -79,7 +79,9 @@ } @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3.3", id = "a") + @SpecAssertions( { + @SpecAssertion(section = "3.3.3", id = "a"), + @SpecAssertion(section = "3.3.4", id = "c") } ) public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() { Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); @@ -87,16 +89,24 @@ assert dogBean.getTypes().contains(PitbullLocal.class); } - @Test(groups = { "enterpriseBeans", "stub" }) + /** + * If the EJB has a bean class local view and the bean class is not a + * parameterized type, the set of bean types contains the bean class and all + * superclasses. + */ + @Test(groups = { "enterpriseBeans", "broken" }) @SpecAssertion(section = "3.3.3", id = "b") - public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInBeanTypes() + public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes() { - assert false; + //TODO We need a 3.1 compliant container for this test + Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); + assert dogBean.getTypes().contains(Pitbull.class); } @Test(groups = "enterpriseBeans") @SpecAssertions({ @SpecAssertion(section = "3.3.3", id = "c"), + @SpecAssertion(section = "3.3.4", id = "a"), @SpecAssertion(section = "2.2", id = "l") }) public void testObjectIsInAPITypes() @@ -105,11 +115,12 @@ assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); } - @Test(groups = { "enterpriseBeans", "stub" }) + @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3.3", id = "d") public void testRemoteInterfacesAreNotInAPITypes() { - assert false; + Bean<DogLocal> dogBean = getCurrentManager().resolveByType(DogLocal.class).iterator().next(); + assert !dogBean.getTypes().contains(DogRemote.class); } @Test(groups = "enterpriseBeans") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-03-16 18:30:10 UTC (rev 2048) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Pitbull.java 2009-03-16 19:15:19 UTC (rev 2049) @@ -8,7 +8,7 @@ @Stateful @ApplicationScoped @Named -class Pitbull implements PitbullLocal, DogLocal +class Pitbull extends Dog implements PitbullLocal, DogLocal, DogRemote { public static boolean destructorCalled = false;