4:13 a.m.
Author: shane.bryzak(a)jboss.com
Date: 2009-08-12 22:13:56 -0400 (Wed, 12 Aug 2009)
New Revision: 3470
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
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/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
some restructuring of 4.1 assertions
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-12
23:09:56 UTC (rev 3469)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-13
02:13:56 UTC (rev 3470)
@@ -115,7 +115,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "aa")
+ @SpecAssertion(section = "4.1", id = "aaa")
public void testBindingNotDeclaredInheritedIsNotInherited()
{
Set<? extends Annotation> bindings =
getBeans(ShetlandPony.class).iterator().next().getBindings();
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-12
23:09:56 UTC (rev 3469)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13
02:13:56 UTC (rev 3470)
@@ -27,7 +27,7 @@
public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.1", id = "an")
+ @SpecAssertion(section = "4.1", id = "al")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
Set<? extends Annotation> bindings = getBeans(BorderCollieLocal.class, new
HairyBinding(false)).iterator().next().getBindings();
@@ -35,7 +35,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "ar")
+ @SpecAssertion(section = "4.1", id = "ap")
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class,
new HairyBinding(false)).iterator().next().getBindings();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-12
23:09:56 UTC (rev 3469)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-13
02:13:56 UTC (rev 3470)
@@ -82,7 +82,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "ab")
+ @SpecAssertion(section = "4.1", id = "aba")
public void testStereotypeNotDeclaredInheritedIsNotInherited()
{
assert getBeans(ShetlandPony.class).size() == 1;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-12
23:09:56 UTC (rev 3469)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-13
02:13:56 UTC (rev 3470)
@@ -19,14 +19,14 @@
public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.1", id = "ao")
+ @SpecAssertion(section = "4.1", id = "am")
public void testStereotypeDeclaredInheritedIsInherited() throws Exception
{
assert
getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
@Test
- @SpecAssertion(section = "4.1", id = "as")
+ @SpecAssertion(section = "4.1", id = "aq")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
assert
getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-13 02:13:56 UTC (rev 3470)
@@ -1387,71 +1387,107 @@
</section>
- <section id="4.1" title="Inheritance of type-level
metadata">
- <assertion id="aa">
- <text>For class X which is extended _directly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <section id="4.1" title="Inheritance of type-level
metadata">
+ <group>
+ <text>Suppose a class X is extended directly or indirectly by the bean class
of a managed bean or session bean Y. If X is annotated with a binding type, stereotype or
interceptor binding type Z then Y inherits the annotation if and only if Z declares the
|@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass
of X and a superclass of Y declares an annotation of type Z.</text>
+
+ <assertion id="aa">
+ <text>Test binding type for directly extended managed bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aaa">
+ <text>Test binding type for directly extended managed bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ab">
- <text>For class X which is extended _directly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <assertion id="ab">
+ <text>Test stereotype for directly extended managed bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aba">
+ <text>Test stereotype for directly extended managed bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ad">
- <text>For class X which is extended _directly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <assertion id="ad">
+ <text>Test interceptor binding type for directly extended managed bean
annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ada">
+ <text>Test interceptor binding type for directly extended managed bean not
annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="ag">
+ <text>Test binding type for indirectly extended managed bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aga">
+ <text>Test binding type for indirectly extended managed bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ae">
- <text>For class X which is extended _directly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <assertion id="ah">
+ <text>Test stereotype for indirectly extended managed bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aha">
+ <text>Test stereotype for indirectly extended managed bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ag">
- <text>For class X which is extended _indirectly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
+ <assertion id="aj">
+ <text>Test interceptor binding type for indirectly extended managed bean
annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aja">
+ <text>Test interceptor binding type for indirectly extended managed bean
not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="al">
+ <text>Test binding type for directly extended session bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ala">
+ <text>Test binding type for directly extended session bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ah">
- <text>For class X which is extended _indirectly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
+ <assertion id="am">
+ <text>Test stereotype for directly extended session bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ama">
+ <text>Test stereotype for directly extended session bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="aj">
- <text>For class X which is extended _indirectly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
+ <assertion id="an">
+ <text>Test interceptor binding type for directly extended session bean
annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ana">
+ <text>Test interceptor binding type for directly extended session bean not
annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ak">
- <text>For class X which is extended _indirectly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
-
- <assertion id="al">
- <text>For class X which is extended _directly_ by the bean class of a
_session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <assertion id="ap">
+ <text>Test binding type for indirectly extended session bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="apa">
+ <text>Test binding type for indirectly extended session bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="am">
- <text>For class X which is extended _directly_ by the bean class of a
_session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
+ <assertion id="aq">
+ <text>Test stereotype for indirectly extended session bean annotated
|@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aqa">
+ <text>Test stereotype for indirectly extended session bean not annotated
|@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="ar">
+ <text>Test interceptor binding type for indirectly extended session bean
annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ara">
+ <text>Test interceptor binding type for indirectly extended session bean
not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+ </group>
- <assertion id="an">
- <text>For class X which is extended _directly_ by the bean class of a
_session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
-
- <assertion id="ao">
- <text>For class X which is extended _directly_ by the bean class of a
_session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an
annotation of type Z.</text>
- </assertion>
-
- <assertion id="ap">
- <text>For class X which is extended _indirectly_ by the bean class of a
_session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
-
- <assertion id="aq">
- <text>For class X which is extended _indirectly_ by the bean class of a
_session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
-
- <assertion id="ar">
- <text>For class X which is extended _indirectly_ by the bean class of a
_session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
-
- <assertion id="as">
- <text>For class X which is extended _indirectly_ by the bean class of a
_session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any
intermediate class that is a subclass of X and a superclass of Y declares an annotation of
type Z.</text>
- </assertion>
-
<assertion id="ba">
<text>For class X which is extended _directly_ by the bean class of a
_managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation
if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope
type.</text>
</assertion>