Author: pete.muir(a)jboss.org Date: 2009-02-18 19:38:53 -0500 (Wed, 18 Feb 2009) New Revision: 1589 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: A few more mappings 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-19 00:19:31 UTC (rev 1588) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-19 00:38:53 UTC (rev 1589) @@ -135,42 +135,42 @@ } @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "e") public void testAbstractClassDeclaredInXmlIsNotAllowed() { } @Test(groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "da") public void testStaticInnerClassDeclaredInXmlAllowed() { assert false; } @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "d") public void testNonStaticInnerClassDeclaredInXmlNotAllowed() { assert false; } @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "c") public void testParameterizedClassDeclaredInXmlIsNotAllowed() { assert false; } @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "f") public void testClassHasInterceptorInJavaMustHaveInterceptorInXml() { assert false; } @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "unknown") + @SpecAssertion(section = "3.2.4", id = "g") public void testClassHasDecoratorInJavaMustHaveDecoratorInXml() { assert false; Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 00:19:31 UTC (rev 1588) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 00:38:53 UTC (rev 1589) @@ -685,6 +685,9 @@ <assertion id="b"> <text>A top-level Java class is not a simple bean if it is a non-static inner class</text> </assertion> + <assertion id="ba"> + <text>A top-level Java class that is a static inner class can be a simple bean</text> + </assertion> <assertion id="ca"> <text>A top-level Java class is not a simple bean if it is an abstract class</text> </assertion> @@ -776,6 +779,10 @@ <text>If the bean class of a simple bean defined in XML is a non-static inner class, a DefinitionException is thrown by the container at deployment time.</text> </assertion> + <assertion id="da"> + <text>If the bean class of a simple bean defined in XML is a static inner class, a DefinitionException is not thrown.</text> + </assertion> + <assertion id="e"> <text>If the bean class of a simple bean defined in XML is an abstract class, and the simple bean is not a decorator, a DefinitionException is thrown by the container at deployment time</text>