[webbeans-commits] Webbeans SVN: r1594 - in tck/trunk/impl/src/main: resources and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-18 20:54:31 -0500 (Wed, 18 Feb 2009)
New Revision: 1594

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Some more assertions

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java	2009-02-19 01:36:41 UTC (rev 1593)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java	2009-02-19 01:54:31 UTC (rev 1594)
@@ -7,8 +7,9 @@
 import javax.inject.CreationException;
 import javax.inject.manager.Bean;
 
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
 import org.testng.annotations.Test;
 
@@ -32,7 +33,10 @@
    }
 
    @Test(groups = "beanConstruction")
-   @SpecAssertion(section = "3.2.6.3", id = "unknown")
+   @SpecAssertions({
+     @SpecAssertion(section = "3.2.6.3", id = "a"),
+     @SpecAssertion(section = "2.3.6", id = "d")
+   })
    public void testInjectionOfParametersIntoBeanConstructor()
    {
       Bean<FishPond> goldfishPondBean = createSimpleBean(FishPond.class);
@@ -44,7 +48,7 @@
    }
 
    @Test(groups = { "broken", "specialization" })
-   @SpecAssertion(section = "3.2.7", id = "unknown")
+   @SpecAssertion(section = "3.2.7", id = "c")
    public void testSpecializedBeanAlwaysUsed() throws Exception
    {
       deployBeans(Lion.class, MountainLion.class);
@@ -60,20 +64,6 @@
       }.run();
    }
 
-   /**
-    * The create() method performs the following tasks:
-    * 
-    * • obtains an instance of the bean,
-    * 
-    * • creates the interceptor and decorator stacks and binds them to the
-    * instance,
-    * 
-    * • injects any dependencies,
-    * 
-    * • sets any initial field values defined in XML, and
-    * 
-    * • calls the @PostConstruct method, if necessary.
-    */
    @Test(groups = "beanLifecycle")
    @SpecAssertion(section = "6.2", id = "unknown")
    public void testCreateReturnsInstanceOfBean()
@@ -197,7 +187,7 @@
     * @throws Exception
     */
    @Test
-   @SpecAssertion(section = "4.2", id = "unknown")
+   @SpecAssertion(section = "4.2", id = "ba")
    public void testSubClassInheritsPostConstructOnSuperclass() throws Exception
    {
       OrderProcessor.postConstructCalled = false;
@@ -222,7 +212,7 @@
     * @throws Exception
     */
    @Test
-   @SpecAssertion(section = "4.2", id = "unknown")
+   @SpecAssertion(section = "4.2", id = "bb")
    public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-02-19 01:36:41 UTC (rev 1593)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-02-19 01:54:31 UTC (rev 1594)
@@ -2070,10 +2070,14 @@
       <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X declares an injected field x then Y inherits x.</text>
     </assertion>
     
-    <assertion id="b">
-      <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X declares an initializer method, @PostConstruct method or @PreDestroy method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
+    <assertion id="ba">
+      <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X declares a @PostConstruct method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
     </assertion>
     
+    <assertion id="bb">
+      <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X declares a @PreDestroy method x() then Y inherits x() if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x()</text>
+    </assertion>
+    
     <assertion id="c">
       <text>For class X which is extended directly or indirectly by the bean class of a simple or session bean Y, if X declares a non-static method x() annotated with an interceptor binding type Z then Y inherits the binding if and only if neither Y nor any intermediate class that is a subclass of X and a superclass of Y overrides the method x().</text>
     </assertion>