Author: shane.bryzak(a)jboss.com Date: 2009-07-19 08:58:11 -0400 (Sun, 19 Jul 2009) New Revision: 3086 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java Log: matched simple bean tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-17 22:13:08 UTC (rev 3085) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-19 12:58:11 UTC (rev 3086) @@ -10,7 +10,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -19,8 +19,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "ca"), - @SpecAssertion(section = "3.2", id = "ca") + @SpecAssertion(section = "3.1.1", id = "ca"), + @SpecAssertion(section = "3.1", id = "ca") }) public void testAbstractClassDeclaredInJavaNotDiscovered() { @@ -29,7 +29,7 @@ @Test(groups = "innerClass") @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "ba") + @SpecAssertion(section = "3.1.1", id = "ba") }) public void testStaticInnerClassDeclaredInJavaAllowed() { @@ -38,7 +38,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "b") + @SpecAssertion(section = "3.1.1", id = "b") }) public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() { @@ -46,7 +46,7 @@ } @Test - @SpecAssertion(section = "3.2.1", id = "cb") + @SpecAssertion(section = "3.1.1", id = "cb") public void testInterfaceNotDiscoveredAsSimpleBean() { assert getBeans(Car.class).size() == 0; @@ -64,14 +64,14 @@ // } @Test - @SpecAssertion(section="3.2.1", id="f") + @SpecAssertion(section="3.1.1", id="f") public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() { assert getBeans(MockEnterpriseBean.class).size() == 0; } @Test - @SpecAssertion(section="3.2.1", id="p") + @SpecAssertion(section="3.1.1", id="p") public void testSimpleBeanOnlyIfConstructorParameterless() { assert getBeans(Antelope_NotBean.class).isEmpty(); @@ -79,7 +79,7 @@ } @Test - @SpecAssertion(section="3.2.1", id="q") + @SpecAssertion(section="3.1.1", id="q") public void testSimpleBeanOnlyIfConstructorIsInitializer() { assert getBeans(Antelope_NotBean.class).isEmpty(); @@ -87,7 +87,7 @@ } @Test - @SpecAssertion(section = "3.2.4.1", id = "a") + @SpecAssertion(section = "3.1.4.1", id = "a") public void testInitializerAnnotatedConstructor() throws Exception { new RunInDependentContext() @@ -106,10 +106,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.2.5", id = "a"), - @SpecAssertion(section = "3.2.4.1", id = "ba"), - @SpecAssertion(section = "3.1", id = "a"), - @SpecAssertion(section = "3.2.3", id = "a") + @SpecAssertion(section = "3.1.4.1", id = "ba"), + @SpecAssertion(section = "3.1.3", id = "a") }) public void testEmptyConstructorUsed() { @@ -119,7 +117,7 @@ } @Test - @SpecAssertion(section = "3.2.4.1", id = "a") + @SpecAssertion(section = "3.1.4.1", id = "a") public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception { new RunInDependentContext() @@ -134,7 +132,7 @@ } @Test - @SpecAssertion(section = "3.2", id = "fa") + @SpecAssertion(section = "3.1", id = "fa") public void testDependentScopedBeanCanHavePublicField() throws Exception { new RunInDependentContext() @@ -147,7 +145,5 @@ } }.run(); - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-17 22:13:08 UTC (rev 3085) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-19 12:58:11 UTC (rev 3086) @@ -22,7 +22,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -35,8 +35,8 @@ @Test(groups = "beanConstruction") @SpecAssertions({ - @SpecAssertion(section = "3.2.4.2", id = "b"), - @SpecAssertion(section = "3.2.4.2", id = "c"), + @SpecAssertion(section = "3.1.4.2", id = "b"), + @SpecAssertion(section = "3.1.4.2", id = "c"), @SpecAssertion(section = "2.3.5", id = "d") }) public void testInjectionOfParametersIntoBeanConstructor() @@ -48,7 +48,7 @@ } @Test - @SpecAssertion(section = "3.2.4.2", id = "b") + @SpecAssertion(section = "3.1.4.2", id = "b") public void testBindingTypeAnnotatedConstructor() throws Exception { new RunInDependentContext() @@ -63,7 +63,7 @@ } @Test(groups = { "specialization" }) - @SpecAssertion(section = "3.2.5", id = "aa") + @SpecAssertion(section = "3.1.5", id = "aa") public void testSpecializedBeanAlwaysUsed() throws Exception { new RunInDependentContext() @@ -80,7 +80,7 @@ @Test(groups = "beanLifecycle") @SpecAssertions({ - @SpecAssertion(section = "6.1.1", id = "c"), + @SpecAssertion(section = "6.1.1", id = "ca"), @SpecAssertion(section = "6.1.1", id = "d"), @SpecAssertion(section = "6.1.1", id = "e") }) @@ -107,10 +107,9 @@ @Test(groups = "beanLifecycle") @SpecAssertions({ - @SpecAssertion(section = "6.1.1", id = "a"), @SpecAssertion(section="2", id="g"), @SpecAssertion(section="2.2.1", id="b"), - @SpecAssertion(section="3.2.6", id="a"), + @SpecAssertion(section="3.1.6", id="a"), @SpecAssertion(section = "7", id = "d") }) public void testCreateReturnsInstanceOfBean() @@ -121,8 +120,8 @@ @Test(groups = "injection") @SpecAssertions({ - @SpecAssertion(section = "7.2", id = "c"), - @SpecAssertion(section = "3.8.1", id = "a") + @SpecAssertion(section = "7.3.1", id = "c"), + @SpecAssertion(section = "3.7.1", id = "a") }) public void testCreateInjectsFieldsDeclaredInJava() { @@ -146,8 +145,8 @@ @Test(groups = { "beanLifecycle", "lifecycleCallbacks" }) @SpecAssertions({ - @SpecAssertion(section = "7.2", id = "d"), - @SpecAssertion(section = "7.2", id = "e") + @SpecAssertion(section = "review", id = "review"), // no longer explicit in the spec? + @SpecAssertion(section = "review", id = "review") }) public void testPostConstructPreDestroy() throws Exception { @@ -164,7 +163,7 @@ @Test(groups = { "beanLifecycle", "lifecycleCallbacks" }) @SpecAssertions({ - @SpecAssertion(section = "6.1.2", id = "a") + @SpecAssertion(section = "review", id = "review") // removed from the spec? }) public void testContextualDestroyDisposesWhenNecessary() throws Exception { @@ -180,7 +179,7 @@ @Test(groups = "beanLifecycle") @SpecAssertions({ - @SpecAssertion(section = "6.1.2", id = "a") + @SpecAssertion(section = "review", id = "review") // removed from the spec? }) public void testContextualDestroyCatchesException() { @@ -193,8 +192,7 @@ @Test(groups = "beanLifecycle") @SpecAssertions({ - @SpecAssertion(section = "6.1.2", id = "a"), - @SpecAssertion(section = "6.4.3", id = "a") + @SpecAssertion(section = "review", id = "review") // removed from spec? }) public void testDependentsDestroyedAfterPreDestroy() { @@ -318,7 +316,7 @@ } @Test(expectedExceptions = CreationException.class) - @SpecAssertion(section = "6.1.1", id = "b") + @SpecAssertion(section = "review", id = "review") // removed from spec? public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception { assert getBeans(Lorry_Broken.class).size() == 1; @@ -335,7 +333,7 @@ } @Test(expectedExceptions = FooException.class) - @SpecAssertion(section = "6.1.1", id = "b") + @SpecAssertion(section = "review", id = "review") // removed from spec? public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception { assert getBeans(Van_Broken.class).size() == 1;