[webbeans-commits] Webbeans SVN: r1585 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-18 19:04:19 -0500 (Wed, 18 Feb 2009)
New Revision: 1585

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
Log:
Match 3.2.1

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java	2009-02-18 23:57:27 UTC (rev 1584)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java	2009-02-19 00:04:19 UTC (rev 1585)
@@ -7,6 +7,7 @@
 import javax.inject.manager.Bean;
 
 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.jboss.jsr299.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken;
@@ -32,21 +33,21 @@
    // *** BEAN CLASS CHECKS ****//
 
    @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "3.2", id = "unknown")
+   @SpecAssertion(section = "3.2.1", id = "ca")
    public void testAbstractClassDeclaredInJavaIsNotAllowed()
    {
       createSimpleBean(Cow_Broken.class);
    }
 
    @Test(groups = "innerClass")
-   @SpecAssertion(section = "3.2", id = "unknown")
+   @SpecAssertion(section = "3.2.1", id = "cc")
    public void testStaticInnerClassDeclaredInJavaAllowed()
    {
       createSimpleBean(StaticInnerBean_Broken.class);
    }
 
    @Test(expectedExceptions = DefinitionException.class, groups = "innerClass")
-   @SpecAssertion(section = "3.2", id = "unknown")
+   @SpecAssertion(section = "3.2.1", id = "b")
    public void testNonStaticInnerClassDeclaredInJavaNotAllowed()
    {
       createSimpleBean(InnerBean_Broken.class);
@@ -54,14 +55,14 @@
 
    @SuppressWarnings("unchecked")
    @Test(expectedExceptions = DefinitionException.class)
-   @SpecAssertion(section = "3.2", id = "unknown")
+   @SpecAssertion(section = "3.2.1", id = "a")
    public void testParameterizedClassDeclaredInJavaIsNotAllowed()
    {
       createSimpleBean(ParameterizedBean_Broken.class);
    }
 
    @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "decorators" })
-   @SpecAssertion(section = "3.2", id = "unknown")
+   @SpecAssertion(section = "3.2.1", id = "unknown")
    public void testClassCannotBeInterceptorAndDecorator()
    {
 
@@ -74,6 +75,12 @@
    // }
 
    @Test
+   @SpecAssertions( { 
+      @SpecAssertion(section = "3.2.1", id = "g"), 
+      @SpecAssertion(section = "3.2.1", id = "h"), 
+      @SpecAssertion(section = "3.2.1", id = "i"), 
+      @SpecAssertion(section = "3.2.1", id = "j"),
+      @SpecAssertion(section = "3.2.1", id = "k")})
    public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans()
    {
       deployBeans(MockFilter.class, MockHttpSessionListener.class, MockServlet.class, MockServletContextListener.class, MockServletRequestListener.class);
@@ -85,6 +92,7 @@
    }
 
    @Test
+   @SpecAssertion(section="3.2.1", id="l")
    public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
    {
       deployBeans(MockEnterpriseBean.class);
@@ -92,6 +100,7 @@
    }
 
    @Test
+   @SpecAssertion(section="3.2.1", id="m")
    public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean()
    {
       deployBeans(MockUIComponent.class);