[webbeans-commits] Webbeans SVN: r993 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding.

Author: pete.muir(a)jboss.org Date: 2009-01-15 14:47:02 -0500 (Thu, 15 Jan 2009) New Revision: 993 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BorderCollie.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ClippedBorderCollie.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Hairy.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Horse.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/LongHairedDog.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ShetlandPony.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Species.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java Log: Add tests for binding type inheritance Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java 2009-01-15 19:20:42 UTC (rev 992) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTypeTest.java 2009-01-15 19:47:02 UTC (rev 993) @@ -4,7 +4,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.List; +import java.util.Set; +import javax.webbeans.Current; import javax.webbeans.Production; import javax.webbeans.manager.Bean; @@ -165,5 +167,32 @@ { assert false; } + + @Test @SpecAssertion(section="4.1") + public void testBindingTypeDeclaredInheritedIsInherited() throws Exception + { + Set<? extends Annotation> bindings = getSimpleBean(BorderCollie.class).getBindings(); + assert bindings.size() == 1; + assert bindings.iterator().next().annotationType().equals(Hairy.class); + } + + @Test @SpecAssertion(section="4.1") + public void testBindingTypeNotDeclaredInheritedIsNotInherited() + { + Set<? extends Annotation> bindings = getSimpleBean(ShetlandPony.class).getBindings(); + assert bindings.size() == 1; + assert bindings.iterator().next().annotationType().equals(Current.class); + } + + @Test @SpecAssertion(section="4.1") + public void testBindingTypeDeclaredInheritedIsBlockedByIntermediateClass() + { + Set<? extends Annotation> bindings = getSimpleBean(ClippedBorderCollie.class).getBindings(); + assert bindings.size() == 1; + Annotation binding = bindings.iterator().next(); + assert binding.annotationType().equals(Hairy.class); + Hairy hairy = (Hairy) binding; + assert hairy.clipped(); + } } \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BorderCollie.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +class BorderCollie extends LongHairedDog +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BorderCollie.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ClippedBorderCollie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ClippedBorderCollie.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ClippedBorderCollie.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +@Hairy(clipped=true) +class ClippedBorderCollie extends BorderCollie +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ClippedBorderCollie.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Hairy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Hairy.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Hairy.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,26 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@Inherited +@interface Hairy +{ + + public boolean clipped(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Hairy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Horse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Horse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Horse.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +@Species +public class Horse +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Horse.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/LongHairedDog.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/LongHairedDog.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/LongHairedDog.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +@Hairy(clipped=false) +class LongHairedDog +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/LongHairedDog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ShetlandPony.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ShetlandPony.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ShetlandPony.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +public class ShetlandPony extends Horse +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/ShetlandPony.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Species.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Species.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Species.java 2009-01-15 19:47:02 UTC (rev 993) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.definition.binding; + +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.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +public @interface Species +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/Species.java ___________________________________________________________________ Name: svn:mime-type + text/plain