[webbeans-commits] Webbeans SVN: r2816 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment: broken/tooMany and 8 other directories.

Author: pete.muir(a)jboss.org Date: 2009-06-10 12:12:53 -0400 (Wed, 10 Jun 2009) New Revision: 2816 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java Log: TCK updates Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -1,31 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.broken; - -import javax.inject.DeploymentException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - */ -@Artifact -(a)BeansXml("beans.xml") -(a)ExpectedDeploymentException(DeploymentException.class) -public class BrokenDeploymentTypeTest extends AbstractJSR299Test -{ - - @SuppressWarnings("unchecked") - @Test - @SpecAssertion(section="2.5.6", id = "c") - public void testStandardMustBeDeclared() - { - assert false; - } - - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -32,8 +32,10 @@ @ExpectedDeploymentException(DefinitionException.class) public class TooManyDeploymentTypesTest extends AbstractJSR299Test { - @Test(groups = { "deploymentType"}) - @SpecAssertion(section = "2.5.3", id = "d") + @Test(groups = { "deploymentType", "rewrite"}) + // Definition exception has gone + //@SpecAssertion(section = "2.5.3", id = "d") + @SpecAssertion(section = "unknown", id = "unknown") public void testTooManyDeploymentTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -12,7 +12,8 @@ @ExpectedDeploymentException(DefinitionException.class) public class ProducerFieldDeploymentTest extends AbstractJSR299Test { - @Test(groups = { "deploymentType"}) + @Test(groups = { "deploymentType", "rewrite"}) + // DefinitionException has gone @SpecAssertion(section = "2.5.3", id = "f") public void testTooManyDeploymentTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -12,8 +12,10 @@ @ExpectedDeploymentException(DefinitionException.class) public class ProducerMethodDeploymentTest extends AbstractJSR299Test { - @Test(groups = { "deploymentType"}) - @SpecAssertion(section = "2.5.3", id = "e") + @Test(groups = { "deploymentType" , "rewrite"}) + // DefinitionException has gone + //@SpecAssertion(section = "2.5.3", id = "e") + @SpecAssertion(section= "unknown", id ="unknown") public void testTooManyDeploymentTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -16,8 +16,10 @@ @ExpectedDeploymentException(DefinitionException.class) public class ParameterizedTypeInjectionTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section = "2.2", id = "c") + @Test(groups = "rewrite") + //@SpecAssertion(section = "2.2", id = "c") + // TODO no more DefinitionException + @SpecAssertion(section = "unknown", id = "unknown") public void testInjectionPointIsNotParameterizedTypeWithTypeVariable() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -17,7 +17,8 @@ public class WildcardTypeInjectionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "2.2", id = "d") + //@SpecAssertion(section = "2.2", id = "d") + @SpecAssertion(section="unknown", id="unknown") public void testInjectionPointIsNotParameterizedTypeWithWildcardVariable() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -11,7 +11,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -20,11 +20,12 @@ { @SuppressWarnings("unchecked") - @Test + @Test(groups="rewrite") @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "b"), + @SpecAssertion(section = "2.5.5", id = "b"), @SpecAssertion(section = "2.5.2", id = "d") }) + // Note new wording around @Standard not being explicitly needed public void testCustomDeploymentTypes() { assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().size() == 3; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -11,7 +11,7 @@ /** * - * Spec version: PRD2 + * Spec version: 20090519 * */ @Artifact @@ -20,7 +20,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "d") + @SpecAssertion(section = "2.5.5", id = "d") }) public void testDefaultEnabledDeploymentTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -9,14 +9,21 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @IntegrationTest @Artifact @Packaging(PackagingType.EAR) @BeansXml("beans.xml") public class EnterpriseDeploymentTypeDefinitionTest extends AbstractJSR299Test { + @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "cb") + @SpecAssertion(section = "unknown", id = "unknown") + //@SpecAssertion(section = "4.1", id = "cb") public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception { assert getBeans(BorderCollieLocal.class, new WoofBinding()).size() == 1; @@ -24,7 +31,8 @@ } @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "4.1", id = "cd") + @SpecAssertion(section = "unknown", id = "unknown") + //@SpecAssertion(section = "4.1", id = "cd") public void testDeploymentTypeDeclaredInheritedIsIndirectlyInherited() throws Exception { assert getBeans(EnglishBorderCollieLocal.class).size() == 1; @@ -32,7 +40,8 @@ } @Test - @SpecAssertion(section = "4.1", id = "dbb") + @SpecAssertion(section = "unknown", id = "unknown") + //@SpecAssertion(section = "4.1", id = "dbb") public void testDeploymentTypeIsOverriddenByInheritedDeploymentType() { assert getBeans(CowLocal.class).size() == 1; @@ -40,7 +49,8 @@ } @Test - @SpecAssertion(section = "4.1", id = "ddb") + @SpecAssertion(section = "unknown", id = "unknown") + //@SpecAssertion(section = "4.1", id = "ddb") public void testDeploymentTypeIsOverriddenByIndirectlyInheritedDeploymentType() { assert getBeans(JerseyBullLocal.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-10 15:44:08 UTC (rev 2815) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-10 16:12:53 UTC (rev 2816) @@ -8,6 +8,11 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; +/** + * + * Spec version: 20090519 + * + */ @Artifact @ExpectedDeploymentException(DefinitionException.class) public class NonBuiltInUsesStandardTest extends AbstractJSR299Test