[weld-commits] Weld SVN: r5827 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean and 3 other directories.

[weld-commits at lists.jboss.org]

Author: jharting
Date: 2010-02-09 04:40:13 -0500 (Tue, 09 Feb 2010)
New Revision: 5827

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
   cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
Matched tests with assertions

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java	2010-02-09 09:38:01 UTC (rev 5826)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java	2010-02-09 09:40:13 UTC (rev 5827)
@@ -34,7 +34,7 @@
 public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
 {
    @Test(groups = { "contexts", "passivation", "integration"})
-   @SpecAssertion(section = "6.6.4", id = "fb")
+   @SpecAssertion(section = "6.6.4", id = "fbb")
    public void test()
    {
       try

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java	2010-02-09 09:38:01 UTC (rev 5826)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java	2010-02-09 09:40:13 UTC (rev 5827)
@@ -34,7 +34,7 @@
 public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
 {
    @Test(groups = { "contexts", "passivation", "integration"})
-   @SpecAssertion(section = "6.6.4", id = "fa")
+   @SpecAssertion(section = "6.6.4", id = "fab")
    public void test()
    {
       try

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java	2010-02-09 09:38:01 UTC (rev 5826)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java	2010-02-09 09:40:13 UTC (rev 5827)
@@ -36,7 +36,8 @@
 
    @Test
    @SpecAssertions({  
-      @SpecAssertion(section = "5.1.1", id = "k") 
+      @SpecAssertion(section = "5.1.1", id = "k"), 
+      @SpecAssertion(section = "5.1.4", id = "q") 
    })
    public void testGetBeanClassCalled()
    {
@@ -72,7 +73,10 @@
    }
 
    @Test
-   @SpecAssertion(section = "5.2.1", id = "b")
+   @SpecAssertions({
+      @SpecAssertion(section = "5.2.1", id = "b"),
+      @SpecAssertion(section = "6.6.4", id = "ga")
+   })
    public void testGetInjectionPointsCalled()
    {
       assert IntegerBean.bean.isGetInjectionPointsCalled();

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java	2010-02-09 09:38:01 UTC (rev 5826)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java	2010-02-09 09:40:13 UTC (rev 5827)
@@ -34,7 +34,8 @@
    @Test(groups = { "initializerMethod" })
    @SpecAssertions({
       @SpecAssertion(section = "3.9.1", id = "f"),
-      @SpecAssertion(section = "2.3.5", id = "b")
+      @SpecAssertion(section = "2.3.5", id = "b"),
+      @SpecAssertion(section = "3.9", id = "a")
    })
    public void testBindingTypeOnInitializerParameter()
    {

Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2010-02-09 09:38:01 UTC (rev 5826)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2010-02-09 09:40:13 UTC (rev 5827)
@@ -3237,7 +3237,7 @@
       <text>Suppose a Unified EL expression in a JSF or JSP page refers to a bean with scope |@Dependent| by its EL name.  Each time the EL expression is evaluated the bean is instantiated at most once, and the resulting instance is reused for every appearance of the EL name, and the resulting instance is destroyed when the evaluation completes.</text>
     </assertion>
     
-    <assertion id="b">
+    <assertion id="b" testable="false">
       <text>Portable extensions that integrate with the container via Unified EL should also ensure that these rules are enforced.</text>
     </assertion>
   </section>