Author: shane.bryzak(a)jboss.com
Date: 2009-08-14 00:16:16 -0400 (Fri, 14 Aug 2009)
New Revision: 3489
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.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
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.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/broken/sameName/SameNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
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/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
some more section 4 tests, refine some of the assertions
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
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -37,8 +37,7 @@
@Test
@SpecAssertion(section = "4.1", id = "ala")
public void testBindingNotDeclaredInheritedIsNotInherited() throws Exception
- {
- Set<? extends Annotation> bindings =
getBeans(SkinnyHairlessCatLocal.class).iterator().next().getBindings();
+ {
assert getBeans(SkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
}
@@ -53,8 +52,7 @@
@Test
@SpecAssertion(section = "4.1", id = "apa")
public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
- {
- Set<? extends Annotation> bindings =
getBeans(TameSkinnyHairlessCatLocal.class).iterator().next().getBindings();
+ {
assert getBeans(TameSkinnyHairlessCatLocal.class, new HairlessBinding()).size() ==
0;
}
}
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
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -3,7 +3,7 @@
import javax.ejb.Stateless;
@Stateless
-public class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal
+class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal
{
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -3,7 +3,7 @@
import javax.ejb.Stateless;
@Stateless
-public class TameSkinnyHairlessCat extends SkinnyHairlessCat implements
TameSkinnyHairlessCatLocal
+class TameSkinnyHairlessCat extends SkinnyHairlessCat implements
TameSkinnyHairlessCatLocal
{
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -3,32 +3,32 @@
import javax.enterprise.inject.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
-/**
- *
- * Spec version: 20090519
- * These tests are no longer needed in the TCK.
- *
- */
@IntegrationTest
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
+@SpecVersion("20090625")
public class EnterpriseProducerMethodDefinitionTest extends AbstractJSR299Test
{
-// @Test
+ @Test
+ @SpecAssertion(section = "4.2", id = "dd")
public void testNonStaticProducerMethodInheritedBySpecializingSubclass()
{
assert getBeans(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
assert getInstanceByType(Egg.class,new AnnotationLiteral<Yummy>()
{}).getMother().getClass().equals(AndalusianChicken.class);
}
-// @Test
+ @Test
+ @SpecAssertion(section = "4.2", id = "dd")
public void testNonStaticProducerMethodNotInherited()
{
assert getBeans(Apple.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -71,7 +71,7 @@
@Test(groups = { "producerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "4.3.2", id = "a"),
+ @SpecAssertion(section = "4.3.2", id = "ab"),
@SpecAssertion(section = "5.6.6", id = "c"),
@SpecAssertion(section="4.3", id="cb")
})
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-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -38,7 +38,7 @@
@Test
- @SpecAssertion(section="4.3.2", id = "a")
+ @SpecAssertion(section="4.3.2", id = "aa")
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws
Exception
{
assert getBeans(Waste.class).size() == 1;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -20,7 +20,7 @@
public class SameNameTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.3.1", id = "l")
+ @SpecAssertion(section = "4.3.1", id = "lc")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -14,10 +14,8 @@
@SpecVersion("20090625")
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
{
-
-
@Test
- @SpecAssertion(section = "4.3.1", id = "l")
+ @SpecAssertion(section = "4.3.1", id = "la")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
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-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -27,7 +27,8 @@
@SuppressWarnings("unchecked")
@Test
@SpecAssertions( {
- @SpecAssertion(section = "4.3.1", id = "i"),
+ @SpecAssertion(section = "4.3.1", id = "ia"),
+ @SpecAssertion(section = "4.3.1", id = "ib"),
@SpecAssertion(section = "4.3.1", id = "j"),
@SpecAssertion(section = "3.1.5", id = "aa")
})
@@ -53,7 +54,7 @@
@Test
@SpecAssertions( {
- @SpecAssertion(section = "4.3.2", id = "a"),
+ @SpecAssertion(section = "4.3.2", id = "ab"),
@SpecAssertion(section="4.3", id="cb")
})
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean()
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -15,7 +15,7 @@
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.3.1", id = "l")
+ @SpecAssertion(section = "4.3.1", id = "lb")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DeluxeHenHouse extends HenHouse implements DeluxeHenHouseLocal
+{
+ public Fox getFox()
+ {
+ return fox;
+ }
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface DeluxeHenHouseLocal
+{
+ Fox getFox();
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.enterprise.context.Dependent;
+
+@Dependent
+class Fox
+{
+
+ public String getName()
+ {
+ return "gavin";
+ }
+
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/HenHouse.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.enterprise.inject.Current;
+
+public class HenHouse
+{
+
+ @Current
+ public Fox fox;
+
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class MegaPoorHenHouse extends PoorHenHouse implements MegaPoorHenHouseLocal
+{
+ public Fox getFox()
+ {
+ return fox;
+ }
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface MegaPoorHenHouseLocal
+{
+ Fox getFox();
+}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+
+class PoorHenHouse extends HenHouse
+{
+
+}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-14
00:24:39 UTC (rev 3488)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-14
04:16:16 UTC (rev 3489)
@@ -20,6 +20,7 @@
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.lookup.injection.DeluxeHenHouse;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -61,4 +62,22 @@
// Test interceptor that intercepts non-contextual Session Bean
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().getAnimalCount()
== 2;
}
+
+ @Test
+ @SpecAssertion(section = "4.2", id = "ab")
+ public void testFieldDeclaredInSuperclassInjected()
+ {
+ DeluxeHenHouseLocal henHouse = getInstanceByType(DeluxeHenHouseLocal.class);
+ assert henHouse.getFox() != null;
+ assert henHouse.getFox().getName().equals("gavin");
+ }
+
+ @Test
+ @SpecAssertion(section = "4.2", id = "ad")
+ public void testFieldDeclaredInSuperclassIndirectlyInjected()
+ {
+ MegaPoorHenHouseLocal henHouse = getInstanceByType(MegaPoorHenHouseLocal.class);
+ assert henHouse.getFox() != null;
+ assert henHouse.getFox().getName().equals("gavin");
+ }
}
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 00:24:39 UTC (rev 3488)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 04:16:16 UTC (rev 3489)
@@ -1707,11 +1707,11 @@
</section>
<section id="4.3.1" title="Direct and indirect
specialization">
- <assertion id="i">
+ <assertion id="ia">
<text>A bean X is said to specialize another bean Y if X directly specializes
Y.</text>
</assertion>
- <assertion id="i">
+ <assertion id="ib">
<text>A bean X is said to specialize another bean Y if a bean Z exists, such
that X directly specializes Z and Z specializes Y.</text>
</assertion>
@@ -1722,11 +1722,23 @@
<assertion id="k">
<text>A bean X that specializes bean Y will have the same name as Y if Y has
a name.</text>
</assertion>
+
+ <group>
+ <text>If X declares a name explicitly, using @Named, 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 id="la">
+ <text>Test that a specializing producer method with a name throws a
deployment exception.</text>
+ </assertion>
+
+ <assertion id="lb">
+ <text>Test that a specializing managed bean with a name throws a deployment
exception.</text>
+ </assertion>
+
+ <assertion id="lc">
+ <text>Test that a specializing enterprise bean with a name throws a
deployment exception.</text>
+ </assertion>
+ </group>
- <assertion id="l">
- <text>If X declares a name explicitly, using @Named, 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>
-
<assertion id="m">
<text>X must have all the bean types of Y. If X does not support some bean
type of Y, 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>
@@ -1736,9 +1748,13 @@
<group>
<text>Non-static producer methods, producer fields, disposal methods and
observer methods of a bean are invoked upon an instance of the most specialized enabled
bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer
or disposal methods", Section 5.6.7, "Access to producer field values" and
Section 5.6.8, "Invocation of observer methods".</text>
- <assertion id="a">
- <text>Test with non-static producer method.</text>
- </assertion>
+ <assertion id="aa">
+ <text>Test with non-static producer method on an enterprise
bean.</text>
+ </assertion>
+
+ <assertion id="ab">
+ <text>Test with non-static producer method on a managed bean.</text>
+ </assertion>
<assertion id="b">
<text>Test with non-static producer field.</text>