Author: pete.muir(a)jboss.org Date: 2009-06-10 11:44:08 -0400 (Wed, 10 Jun 2009) New Revision: 2815 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java Log: update tck to 20090519 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-06-10 15:36:09 UTC (rev 2814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-06-10 15:44:08 UTC (rev 2815) @@ -13,6 +13,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-06-10 15:36:09 UTC (rev 2814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/DeploymentTypeDefinitionTest.java 2009-06-10 15:44:08 UTC (rev 2815) @@ -18,9 +18,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: Public Release Draft 2 - * + * Spec version: 20090519 */ @Artifact @BeansXml("beans.xml") @@ -40,10 +38,6 @@ assert elements.contains(ElementType.FIELD); } - /** - * - * TODO This text is not really a testable assertion - */ @Test(groups = { "annotationDefinition", "deploymentType" }) @SpecAssertion(section = "2.5.2", id = "c") public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() @@ -54,7 +48,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "c") + @SpecAssertion(section = "2.5.3", id = "g") public void testDeploymentTypeInheritedFromDeclaringBean() throws Exception { assert getBeans(BlackWidow.class).size() == 1; @@ -63,7 +57,7 @@ } @Test(groups = { "webbeansxml", "deploymentType" }) - @SpecAssertion(section = "2.5.5", id = "a") + @SpecAssertion(section = "2.5.4", id = "aa") public void testDefaultDeploymentType() { assert getBeans(Tarantula.class).size() == 1; @@ -72,7 +66,7 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.5", id = "b") + @SpecAssertion(section = "2.5.4", id = "b") public void testHighestPrecedenceDeploymentTypeFromStereotype() { assert getBeans(Rhinoceros.class).size() == 1; @@ -81,7 +75,7 @@ } @Test(groups = { "beanLifecycle", "deploymentType" }, expectedExceptions = UnsatisfiedResolutionException.class) - @SpecAssertion(section = "2.5.6", id = "a") + @SpecAssertion(section = "2.5.5", id = "a") public void testBeanWithDisabledDeploymentTypeNotInstantiated() { getInstanceByType(RedSnapper.class); @@ -89,7 +83,7 @@ @Test(groups = { "deploymentType" }) @SpecAssertions( { - @SpecAssertion(section = "2.5.5", id = "c"), + @SpecAssertion(section = "2.5.4", id = "c"), @SpecAssertion(section = "2.7.2", id = "da") }) public void testWebBeanDeploymentTypeOverridesStereotype()