Author: pete.muir(a)jboss.org Date: 2009-08-14 17:37:35 -0400 (Fri, 14 Aug 2009) New Revision: 3501 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java Log: Fix tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-14 21:31:24 UTC (rev 3500) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -4,6 +4,7 @@ import java.util.Set; import javax.enterprise.inject.Any; +import javax.enterprise.inject.spi.Bean; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; @@ -38,7 +39,7 @@ @SpecAssertion(section = "4.1", id = "ala") public void testBindingNotDeclaredInheritedIsNotInherited() throws Exception { - assert getBeans(SkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0; + assert getBeans(TameSkinnyHairlessCatLocal.class, new SkinnyBinding()).size() == 0; } @Test @@ -53,6 +54,7 @@ @SpecAssertion(section = "4.1", id = "apa") public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited() { - assert getBeans(TameSkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0; + Set<Bean<FamousCatLocal>> beans = getBeans(FamousCatLocal.class, new SkinnyBinding()); + assert beans.size() == 0; } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.binding.enterprise; + +import javax.ejb.Stateless; + +@Stateless +class FamousCat extends TameSkinnyHairlessCat implements FamousCatLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.binding.enterprise; + +import javax.ejb.Local; + +@Local +public interface FamousCatLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/FamousCatLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.definition.binding.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +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.enterprise.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Skinny +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Skinny.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.definition.binding.enterprise; + +import javax.enterprise.inject.AnnotationLiteral; + +public class SkinnyBinding extends AnnotationLiteral<Skinny> implements Skinny +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-14 21:31:24 UTC (rev 3500) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-14 21:37:35 UTC (rev 3501) @@ -3,6 +3,7 @@ import javax.ejb.Stateless; @Stateless +@Skinny class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal {