7:33 p.m.
Author: jharting
Date: 2009-07-31 06:33:46 -0400 (Fri, 31 Jul 2009)
New Revision: 3381
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Split assertions
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-31
09:19:46 UTC (rev 3380)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-31
10:33:46 UTC (rev 3381)
@@ -159,7 +159,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6.9", id = "e")
+ @SpecAssertion(section = "5.6.9", id = "ea")
public void testDependentScope()
{
assert getBeans(InjectionPoint.class).size() == 1;
@@ -168,7 +168,7 @@
@Test(groups = { "injectionPoint" })
@SpecAssertions({
- @SpecAssertion(section = "5.6.9", id = "e")
+ @SpecAssertion(section = "5.6.9", id = "ea")
})
public void testApiTypeInjectionPoint()
{
@@ -181,7 +181,7 @@
@Test(groups = { "injectionPoint" })
@SpecAssertions({
- @SpecAssertion(section = "5.6.9", id = "e")
+ @SpecAssertion(section = "5.6.9", id = "ea")
})
public void testCurrentBinding()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-31
09:19:46 UTC (rev 3380)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-07-31
10:33:46 UTC (rev 3381)
@@ -68,7 +68,7 @@
}
@Test(groups = {"policy", "ri-broken"})
- @SpecAssertion(section = "5.2", id = "f")
+ @SpecAssertion(section = "5.2", id = "fa")
// WBRI-306
public void testProducerPolicies() throws Exception
{
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-31 09:19:46 UTC (rev 3380)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-31 10:33:46 UTC (rev 3381)
@@ -1798,9 +1798,17 @@
<text>A policy is enabled for the bean deployment archive if the policy is a
~managed bean~ or _session bean_ and the bean class of the bean is listed.</text>
</assertion>
- <assertion id="f">
- <text>A policy is enabled for the bean deployment archive if the policy is a
producer method, field or resource, and the bean class that declares the method or field
is listed.</text>
- </assertion>
+ <group>
+ <text>A policy is enabled for the bean deployment archive if the policy is a
producer method, field or resource, and the bean class that declares the method or field
is listed.</text>
+
+ <assertion id="fa">
+ <text>Test for enablement of a producer method and field.</text>
+ </assertion>
+
+ <assertion id="fb">
+ <text>Test for enablement of a resource.</text>
+ </assertion>
+ </group>
<assertion id="g">
<text>A policy is enabled for the bean deployment archive if any |@Policy|
stereotype of the policy is listed.</text>
@@ -2239,10 +2247,14 @@
<text>The |isTransient()| method returns true if the injection point is a
transient field, and false otherwise.</text>
</assertion>
- <assertion id="e">
- <text>The container must provide a bean with scope |@Dependent|, bean type
|InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section
6.4.2, "Dependent objects", to obtain information about the injection point to
which they belong. The built-in implementation must be a passivation capable dependency,
as defined in Section 6.6.2, "Passivation capable dependencies".</text>
+ <assertion id="ea">
+ <text>The container must provide a bean with scope |@Dependent|, bean type
|InjectionPoint| and binding |@Current|, allowing dependent objects, as defined in Section
6.4.2, "Dependent objects", to obtain information about the injection point to
which they belong.</text>
</assertion>
+ <assertion id="eb">
+ <text>The built-in implementation must be a passivation capable dependency, as
defined in Section 6.6.2, "Passivation capable dependencies".</text>
+ </assertion>
+
<assertion id="f">
<text>If a bean that declares any scope other than |@Dependent| has an
injection point of type |InjectionPoint| and binding |@Current|, the container
automatically detects the problem and treats it as a definition error, as defined in
Section 12.4, "Problems detected automatically by the container".</text>
</assertion>