Author: pete.muir(a)jboss.org Date: 2009-03-23 14:26:06 -0400 (Mon, 23 Mar 2009) New Revision: 2148 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java Log: minor, fix test to be spec compliant Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java 2009-03-23 15:09:12 UTC (rev 2147) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java 2009-03-23 18:26:06 UTC (rev 2148) @@ -7,5 +7,5 @@ { String getClassName(); - + public Waste getWaste(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-03-23 15:09:12 UTC (rev 2147) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-03-23 18:26:06 UTC (rev 2148) @@ -44,7 +44,7 @@ } - @Test(groups="ri-broken") + @Test @SpecAssertion(section="4.3.1", id = "g") public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java 2009-03-23 15:09:12 UTC (rev 2147) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java 2009-03-23 18:26:06 UTC (rev 2148) @@ -1,5 +1,8 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise; +import javax.ejb.Local; + +@Local public interface OfficeLocal { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-03-23 15:09:12 UTC (rev 2147) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-03-23 18:26:06 UTC (rev 2148) @@ -3,6 +3,7 @@ import java.lang.annotation.Annotation; import javax.inject.AnnotationLiteral; +import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -30,9 +31,10 @@ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { 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); + Bean<?> bean = getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next(); + assert bean.getTypes().contains(LazyFarmer.class); + assert bean.getBindings().size() == 2; + assert annotationSetMatches(bean.getBindings(), Landowner.class, Lazy.class); } @Test