[webbeans-commits] Webbeans SVN: r3091 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer and 2 other directories.

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-07-19 23:26:04 -0400 (Sun, 19 Jul 2009)
New Revision: 3091

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
matched initializer tests to assertions

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java	2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java	2009-07-20 03:26:04 UTC (rev 3091)
@@ -11,7 +11,7 @@
 
 /**
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  * 
  */
 @Artifact
@@ -19,11 +19,10 @@
 @IntegrationTest
 public class EjbInitializerMethodTest extends AbstractJSR299Test
 {
-   
    @Test(groups = { "initializerMethod", "ejb3" })
    @SpecAssertions({
-      @SpecAssertion(section = "3.9", id = "e"),
-      @SpecAssertion(section = "3.9", id = "ca")
+      @SpecAssertion(section = "3.8", id = "e"),
+      @SpecAssertion(section = "3.8", id = "ca")
    })
    public void testInitializerMethodNotABusinessMethod()
    {
@@ -31,5 +30,4 @@
       getInstanceByType(LocalChicken.class).cluck();
       assert AndalusianChicken.nonBusinessMethodCalled = true;
    }
-   
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java	2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java	2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
 
 /**
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  */
 @Artifact
 @Packaging(PackagingType.EAR)
@@ -19,7 +19,7 @@
 
    @Test(groups = { "initializerMethod" })
    @SpecAssertions({
-      @SpecAssertion(section = "3.9.2", id = "b")
+      @SpecAssertion(section = "3.8.2", id = "b")
    })
    public void testBindingTypeOnInitializerParameter()
    {
@@ -30,7 +30,7 @@
    }
 
    @Test(groups = { "stub", "initializerMethod", "interceptors" })
-   @SpecAssertion(section = "3.9", id = "f")
+   @SpecAssertion(section = "3.8", id = "f")
    public void testMethodInterceptorNotCalledOnInitializerMethod()
    {
       assert false;
@@ -38,10 +38,10 @@
 
    @Test(groups = { "initializerMethod" })
    @SpecAssertions({ 
-      @SpecAssertion(section = "3.9", id = "g"), 
-      @SpecAssertion(section = "5.3", id = "b"),
-      @SpecAssertion(section = "3.9.1", id = "a"),
-      @SpecAssertion(section = "3.9.2", id = "aa")
+      @SpecAssertion(section = "3.8", id = "g"), 
+      @SpecAssertion(section = "5.5", id = "b"),
+      @SpecAssertion(section = "3.8.1", id = "a"),
+      @SpecAssertion(section = "3.8.2", id = "aa")
    })
    public void testMultipleInitializerMethodsAreCalled()
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java	2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java	2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
 
 /**
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  */
 @Artifact
 @ExpectedDeploymentException(DefinitionError.class)
@@ -18,7 +18,7 @@
 {
 
    @Test(groups = "initializerMethod")
-   @SpecAssertion(section = "3.9", id = "aa")
+   @SpecAssertion(section = "3.8", id = "aa")
    public void testStaticInitializerMethodNotAllowed()
    {
       assert false;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java	2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java	2009-07-20 03:26:04 UTC (rev 3091)
@@ -10,7 +10,7 @@
 
 /**
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  * 
  */
 @Artifact
@@ -19,7 +19,7 @@
 {
 
    @Test
-   @SpecAssertion(section = "3.2.4.1", id = "ca")
+   @SpecAssertion(section = "3.1.4.1", id = "ca")
    public void testTooManyInitializerAnnotatedConstructor()
    {
       assert false;

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-20 02:46:20 UTC (rev 3090)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-07-20 03:26:04 UTC (rev 3091)
@@ -1214,6 +1214,10 @@
       <text>If the bean is a session bean, the initializer method is not required to be a business method of the session bean</text>
     </assertion>
 
+    <assertion id="f">
+      <text>Method interceptors are never called when the container calls an initializer method</text>
+    </assertion>
+    
     <assertion id="g">
       <text>A bean class may declare multiple (or zero) initializer methods</text>
     </assertion>
@@ -1222,10 +1226,6 @@
       <text>Initializer methods are called by the container after injected fields are initialized, and before the |@PostConstruct| callback occurs.</text>
     </assertion>
 
-    <assertion id="f">
-      <text>Method interceptors are never called when the container calls an initializer method</text>
-    </assertion>
-
     <assertion id="h" testable="false">
       <text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text>
       <note>This is a statement of intent</note>