[webbeans-commits] Webbeans SVN: r3061 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: decorators/definition/broken/tooManyDecoratorsElements and 5 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-07-15 23:55:20 -0400 (Wed, 15 Jul 2009) New Revision: 3061 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java Log: matched bean manager tests, default name tests, other misc tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -27,6 +27,7 @@ /** * @author pmuir * + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) @@ -35,7 +36,7 @@ { @Test - @SpecAssertion(section="8.2", id="c") + @SpecAssertion(section="8.2", id="review") // This assertion doesn't seem to be in the latest version of the spec public void testEnabledDecoratorNotADecoratorTest() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/tooManyDecoratorsElements/TooManyDecoratorElementsTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -31,6 +31,7 @@ /** * @author pmuir * + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DeploymentError.class) @@ -44,7 +45,7 @@ { @Test - @SpecAssertion(section="8.2", id="e") + @SpecAssertion(section="8.2", id="review") // This assertion has been removed from the spec public void testTooManyDecoratorElements() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -10,7 +10,7 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact @@ -19,7 +19,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section="2.6.1", id = "a"), + @SpecAssertion(section="2.5.1", id = "a"), @SpecAssertion(section="2", id="e"), @SpecAssertion(section = "3.2.3", id = "bb") }) @@ -32,9 +32,9 @@ @Test @SpecAssertions({ - @SpecAssertion(section= "2.6.2", id = "a"), + @SpecAssertion(section= "2.5.2", id = "a"), @SpecAssertion(section = "3.2.6", id = "a"), - @SpecAssertion(section = "2.6.1", id = "d") + @SpecAssertion(section = "2.5.1", id = "d") }) public void testDefaultNamed() { @@ -47,7 +47,7 @@ @Test @SpecAssertions({ @SpecAssertion(section = "2.7", id = "a"), - @SpecAssertion(section = "2.7.1.3", id = "b") + @SpecAssertion(section = "2.7.1.3", id = "aaa") }) public void testSterotypeDefaultsName() { @@ -58,7 +58,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section="2.6.3", id = "a"), + @SpecAssertion(section="2.5.3", id = "a"), @SpecAssertion(section="2", id="e") }) public void testNotNamedInJava() @@ -68,7 +68,7 @@ assert bean.getName() == null; } - @Test @SpecAssertion(section="2.6.3", id = "a") + @Test @SpecAssertion(section="2.5.3", id = "a") public void testNotNamedInStereotype() { assert getBeans(Minnow.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -10,17 +10,16 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class NonEmptyNamedTest extends AbstractJSR299Test { - @Test @SpecAssertions({ - @SpecAssertion(section = "2.7.1.3", id = "aa"), - @SpecAssertion(section = "2.6.2", id = "e") + @SpecAssertion(section = "2.7.1.3", id = "aab"), + @SpecAssertion(section = "2.5.2", id = "e") }) public void testStereotypeWithNonEmptyNamed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -17,7 +17,7 @@ { @Test - @SpecAssertion(section = "2.7.1.1", id = "bb") + @SpecAssertion(section = "2.7.1.1", id = "review") // Deployment types have been removed from the spec public void testStereotypeWithTooManyDeploymentTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -7,7 +7,7 @@ import org.testng.annotations.Test; /** - * Spec version: 20090519 + * Spec version: 20090625 */ @Artifact public class DefaultNamedTest extends AbstractJSR299Test @@ -15,8 +15,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.7.1.3", id = "b"), - @SpecAssertion(section = "2.6.2", id = "e") + @SpecAssertion(section = "2.7.1.3", id = "aaa"), + @SpecAssertion(section = "2.5.2", id = "e") }) public void testStereotypeWithEmptyNamed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-07-16 02:07:29 UTC (rev 3060) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-07-16 03:55:20 UTC (rev 3061) @@ -15,14 +15,14 @@ /** * - * Spec version: 20090519 + * Spec version: 20090625 * */ @Artifact public class ManagerTest extends AbstractJSR299Test { @Test(groups={"manager", "injection", "deployment"}) - @SpecAssertion(section="11.2", id = "c") + @SpecAssertion(section="11.3", id = "c") public void testInjectingManager() throws Exception { new RunInDependentContext() @@ -39,22 +39,22 @@ } @Test - @SpecAssertion(section = "11.2", id = "a") + @SpecAssertion(section = "11.3", id = "a") public void testContainerProvidesManagerBean() { assert getBeans(BeanManager.class).size() > 0; } @Test - @SpecAssertion(section = "11.2", id = "a") + @SpecAssertion(section = "11.3", id = "a") public void testManagerBeanIsDependentScoped() { Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next(); assert beanManager.getScopeType().equals(Dependent.class); } - @Test - @SpecAssertion(section = "11.2", id = "a") + @Test(groups = {"deployment"}) + @SpecAssertion(section = "11.3", id = "review") // deployment types removed from spec public void testManagerBeanHasStandardDeployment() { Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next(); @@ -62,7 +62,7 @@ } @Test - @SpecAssertion(section = "11.2", id = "a") + @SpecAssertion(section = "11.3", id = "a") public void testManagerBeanHasCurrentBinding() { Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next(); @@ -71,8 +71,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "11.2.1", id = "a"), - @SpecAssertion(section = "11.2.1", id = "b") + @SpecAssertion(section = "11.3.1", id = "a"), + @SpecAssertion(section = "11.3.1", id = "b") }) public void testGetReferenceReturnsContextualInstance() {