January 2010 - weld-commits - Jboss List Archives

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 12:01:32 -0500 (Fri, 22 Jan 2010) New Revision: 5619 Modified: cdi-tck/trunk/pom.xml Log: use latest parent Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2010-01-22 17:01:08 UTC (rev 5618) +++ cdi-tck/trunk/pom.xml 2010-01-22 17:01:32 UTC (rev 5619) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>6</version> + <version>8</version> </parent>

14 years, 11 months

1
0
0 / 0

Weld SVN: r5618 - cdi-tck/trunk.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 12:01:08 -0500 (Fri, 22 Jan 2010) New Revision: 5618 Modified: cdi-tck/trunk/pom.xml Log: use released versions Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2010-01-22 17:00:30 UTC (rev 5617) +++ cdi-tck/trunk/pom.xml 2010-01-22 17:01:08 UTC (rev 5618) @@ -74,8 +74,8 @@ </modules> <properties> - <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version> - <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version> + <jboss.test.audit.version>1.1.0-CR1</jboss.test.audit.version> + <jboss.test.harness.version>1.1.0-CR4</jboss.test.harness.version> <testng.version>5.10</testng.version> <jsr250.api.version>1.0</jsr250.api.version> <cdi.api.version>1.0</cdi.api.version>

14 years, 11 months

1
0
0 / 0

Weld SVN: r5617 - cdi-tck/trunk/impl/src/main/resources.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 12:00:30 -0500 (Fri, 22 Jan 2010) New Revision: 5617 Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml Log: port r5550 to trunk Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 16:59:45 UTC (rev 5616) +++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 17:00:30 UTC (rev 5617) @@ -1,20 +1,60 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="JSR-299 TCK" verbose="0" > - <test name="JSR-299 TCK"> + + +<suite name="Weld / JBoss AS run of CDI TCK" verbose="0" > + <test name="CDI TCK"> <method-selectors> <method-selector> <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> </method-selector> -  -  </method-selectors> <packages> <package name="org.jboss.jsr299.tck.tests.*" /> <package name="org.jboss.jsr299.tck.interceptors.tests.*" /> </packages> + <classes> + +  + +  + <class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest"> + <methods> + <exclude name="testInterceptorMethodDefinedOnTargetClass" /> + </methods> + </class> + +  + <class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest"> + <methods> + <exclude name="testInvocationOrder" /> + </methods> + </class> +  + <class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest"> + <methods> + <exclude name="testCustomImplementationOfDecoratorInterface" /> + </methods> + </class> +  + <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest"> + <methods> + <exclude name="testAppliesToFinalManagedBeanClass" /> + </methods> + </class> + <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest"> + <methods> + <exclude name="testAppliesToFinalMethodOnManagedBeanClass" /> + </methods> + </class> +  + <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest"> + <methods> + <exclude name="testEJBDecoratorInvocation" /> + </methods> + </class> + + </classes> </test> </suite>

14 years, 11 months

1
0
0 / 0

Weld SVN: r5616 - cdi-tck/trunk/doc/reference/en-US.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:59:45 -0500 (Fri, 22 Jan 2010) New Revision: 5616 Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml Log: port CDITCK-88 to trunk Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-01-22 16:59:27 UTC (rev 5615) +++ cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-01-22 16:59:45 UTC (rev 5616) @@ -180,6 +180,20 @@ </method-selector> </method-selectors>]]></programlisting> </section> + + <section> + <title>Using custom deployment descriptors</title> + <para> + In general, the CDI TCK uses the default deployment descriptors from the + JBoss Test Harness. However, sometimes the CDI TCK needs to override the + deployment descriptor, to hook in additional functionality, or to test a + specific deployment descriptor. You can find all overridden deployment + descriptors list in the <literal>dd-override-report.txt</literal> file + in the TCK bundle. Note that the CDI TCK assumes you won't need to + customize any CDI specified deployment descriptors, so these aren't + listed here. + </para> + </section> <section> <title>Configuring TestNG to execute the TCK</title>

14 years, 11 months

1
0
0 / 0

Weld SVN: r5615 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/request and 8 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:59:27 -0500 (Fri, 22 Jan 2010) New Revision: 5615 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java Log: port r5540 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.Page; @@ -41,7 +41,6 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="home.jspx", source="home.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @@ -49,6 +48,7 @@ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="rain.jspx", source="rain.jsf") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class ClientConversationContextTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -35,11 +35,11 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="cloud.jspx", source="cloud.jsf") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -39,12 +39,12 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="WEB-INF/faces-config.xml", source="faces-config.xml"), @Resource(destination="storm.jspx", source="storm.jsf"), @Resource(destination="thunder.jspx", source="thunder.jsf"), @Resource(destination="lightening.jspx", source="lightening.jsf") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -39,12 +39,12 @@ @Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class}) @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="cloud.jspx", source="cloud.jsf"), @Resource(destination="storm.jspx", source="storm.jsf"), @Resource(destination="clouds.jspx", source="clouds.jsf"), @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class ManualCidPropagationTest extends AbstractConversationTest { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.TextPage; @@ -32,9 +32,9 @@ @Artifact @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class RequestContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.TextPage; @@ -32,9 +32,9 @@ @Artifact @IntegrationTest(runLocally=true) @Resources({ - @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"), @Resource(destination="SimplePage.html", source="SimplePage.html") }) +@WebXml("web.xml") @SpecVersion(spec="cdi", version="20091101") public class SessionContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -28,8 +28,8 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; /** @@ -40,9 +40,9 @@ @Artifact @Packaging(PackagingType.WAR) @IntegrationTest -@Resource(source="web.xml", destination="/WEB-INF/web.xml") @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") +@WebXml("web.xml") public class EnvInjectionTest extends AbstractJSR299Test { @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -30,7 +30,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.ear.PersistenceXml; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -42,8 +42,7 @@ @Artifact @Packaging(PackagingType.WAR) @IntegrationTest -@Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml") -//@PersistenceXml("persistence.xml") +@PersistenceXml("persistence.xml") @BeansXml("beans.xml") @SpecVersion(spec="cdi", version="20091101") public class PersistenceContextInjectionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -21,16 +21,15 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @Artifact @IntegrationTest(runLocally = true) -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") @SpecVersion(spec="cdi", version="20091101") +@WebXml("web.xml") public class ClientProxyTest extends AbstractJSR299Test { @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,7 +23,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -31,11 +31,11 @@ @Artifact @IntegrationTest(runLocally = true) @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "JSFTestPage.jsp", source = "JSFTestPage.jsp"), @Resource(destination = "JSPTestPage.jsp", source = "JSPTestPage.jsp")}) @SpecVersion(spec="cdi", version="20091101") +@WebXml("web.xml") public class IntegrationWithUnifiedELTest extends AbstractJSR299Test { @Test(groups = {"el" } ) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -41,7 +41,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; /** @@ -52,13 +52,13 @@ */ @Artifact @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp"), @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) @IntegrationTest +@WebXml("web.xml") @SpecVersion(spec = "cdi", version = "20091101") public class ContainerEventTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,7 +24,7 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.WebClient; @@ -33,12 +33,12 @@ @Artifact @IntegrationTest(runLocally = true) @Resources( { - @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"), @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"), @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"), @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")}) @SpecVersion(spec="cdi", version="20091101") +@WebXml("web.xml") public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test { @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -24,14 +24,13 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; @Artifact @IntegrationTest(runLocally = true) -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") @SpecVersion(spec="cdi", version="20091101") +@WebXml("web.xml") public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test { @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:58:41 UTC (rev 5614) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:59:27 UTC (rev 5615) @@ -23,15 +23,14 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.testharness.impl.packaging.war.WebXml; import org.testng.annotations.Test; @Artifact @SpecVersion(spec = "cdi", version = "20091101") @ExpectedDeploymentException(DeploymentFailure.class) @IntegrationTest -@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") +@WebXml("web.xml") public class InjectionPointTest extends AbstractJSR299Test { @Test

14 years, 11 months

1
0
0 / 0

Weld SVN: r5614 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: definition/bean/custom and 10 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:58:41 -0500 (Fri, 22 Jan 2010) New Revision: 5614 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java Log: port "CDITCK-78, and switch to always using @Extension" to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -26,7 +26,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -38,7 +38,7 @@ @Artifact @IntegrationTest @SpecVersion(spec="cdi", version="20091101") -@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +@Extension("javax.enterprise.inject.spi.Extension") public class ContextDestroysBeansTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -29,15 +29,12 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; @Artifact @SpecVersion(spec="cdi", version="20091101") -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest public class ContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -27,7 +27,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -39,7 +39,7 @@ @Artifact @SpecVersion(spec="cdi", version="20091101") @IntegrationTest -@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +@Extension("javax.enterprise.inject.spi.Extension") public class NormalContextTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -22,17 +22,14 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; @Artifact @SpecVersion(spec="cdi", version="20091101") @BeansXml("beans.xml") -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest public class CustomBeanImplementationTest extends AbstractJSR299Test { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -24,8 +24,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -36,9 +35,7 @@ * @author Dan Allen */ @Artifact -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") // Must be an integration test as it needs a resource copied to a folder @IntegrationTest @ExpectedDeploymentException(DeploymentFailure.class) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -23,17 +23,14 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** * @author pmuir */ @Artifact -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -23,8 +23,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -32,9 +31,7 @@ * */ @Artifact -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -23,17 +23,14 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** * @author pmuir */ @Artifact -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -28,9 +28,8 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -42,7 +41,7 @@ @Artifact @BeansXml("beans.xml") -@Resources( { @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") }) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec = "cdi", version = "20091101") public class AlternativeMetadataTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -23,8 +23,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; @@ -36,9 +35,7 @@ * */ @Artifact -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec="cdi", version="20091101") public class ProcessAnnotatedTypeTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -24,8 +24,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -36,9 +35,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentFailure.class) -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec="cdi", version="20091101") public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -24,8 +24,7 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -36,9 +35,7 @@ */ @Artifact @ExpectedDeploymentException(DeploymentFailure.class) -@Resources({ - @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") -}) +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec="cdi", version="20091101") public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -32,61 +32,55 @@ import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.ear.EjbJarXml; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** - * Tests for ProcessAnnotatedType, ProcessBean and ProcessInjectionTarget events. + * Tests for ProcessAnnotatedType, ProcessBean and ProcessInjectionTarget + * events. + * * @author Jozef Hartinger - * + * */ @Artifact -@Resources({ - @Resource(source = "javax.enterprise.inject.spi.Extension", destination = "META-INF/services/javax.enterprise.inject.spi.Extension"), - @Resource(source = "ejb-jar.xml", destination = "META-INF/ejb-jar.xml")}) +@EjbJarXml("ejb-jar.xml") @IntegrationTest @SpecVersion(spec = "cdi", version = "20091101") +@Extension("javax.enterprise.inject.spi.Extension") @Packaging(PackagingType.EAR) public class ContainerEventTest extends AbstractJSR299Test { @Test - @SpecAssertions({ - @SpecAssertion(section = "12.3", id = "ba"), - @SpecAssertion(section = "11.5.6", id = "aaa")}) - public void testProcessInjectionTargetFiredForManagedBean() { + @SpecAssertions( { @SpecAssertion(section = "12.3", id = "ba"), @SpecAssertion(section = "11.5.6", id = "aaa") }) + public void testProcessInjectionTargetFiredForManagedBean() + { assert ProcessInjectionTargetObserver.getManagedBeanEvent() != null; validateManagedBean(ProcessInjectionTargetObserver.getManagedBeanEvent().getAnnotatedType()); } - + @Test - @SpecAssertions({ - @SpecAssertion(section = "11.5.6", id = "aab"), - @SpecAssertion(section = "11.5.6", id = "abb"), - @SpecAssertion(section = "12.3", id = "db")}) - public void testProcessInjectionTargetFiredForSessionBean() { + @SpecAssertions( { @SpecAssertion(section = "11.5.6", id = "aab"), @SpecAssertion(section = "11.5.6", id = "abb"), @SpecAssertion(section = "12.3", id = "db") }) + public void testProcessInjectionTargetFiredForSessionBean() + { assert ProcessInjectionTargetObserver.getStatelessSessionBeanEvent() != null; assert ProcessInjectionTargetObserver.getStatefulSessionBeanEvent() != null; validateStatelessSessionBean(ProcessInjectionTargetObserver.getStatelessSessionBeanEvent().getAnnotatedType()); validateStatefulSessionBean(ProcessInjectionTargetObserver.getStatefulSessionBeanEvent().getAnnotatedType()); } - + @Test - @SpecAssertions({ - @SpecAssertion(section = "11.5.6", id = "aaf"), - @SpecAssertion(section = "11.5.6", id = "abf"), - @SpecAssertion(section = "12.3", id = "dh")}) - public void testProcessInjectionTargetFiredForSessionBeanInterceptor() { + @SpecAssertions( { @SpecAssertion(section = "11.5.6", id = "aaf"), @SpecAssertion(section = "11.5.6", id = "abf"), @SpecAssertion(section = "12.3", id = "dh") }) + public void testProcessInjectionTargetFiredForSessionBeanInterceptor() + { assert ProcessInjectionTargetObserver.getSessionBeanInterceptorEvent() != null; validateSessionBeanInterceptor(ProcessInjectionTargetObserver.getSessionBeanInterceptorEvent().getAnnotatedType()); } - + @Test - @SpecAssertions({ - @SpecAssertion(section="11.5.6", id="aal"), - @SpecAssertion(section="11.5.6", id="aam") - }) - public void testTypeOfProcessInjectionTargetParameter() { + @SpecAssertions( { @SpecAssertion(section = "11.5.6", id = "aal"), @SpecAssertion(section = "11.5.6", id = "aam") }) + public void testTypeOfProcessInjectionTargetParameter() + { assert ProcessInjectionTargetObserver.getEvent1Observed() == 0; assert ProcessInjectionTargetObserver.getEvent2Observed() == 0; assert ProcessInjectionTargetObserver.getEvent3Observed() == 0; @@ -96,21 +90,23 @@ } @Test - @SpecAssertion(section = "12.3", id= "bb") - public void testProcessAnnotatedTypeFiredForSessionBean() { + @SpecAssertion(section = "12.3", id = "bb") + public void testProcessAnnotatedTypeFiredForSessionBean() + { assert ProcessAnnotatedTypeObserver.getStatelessSessionBeanEvent() != null; assert ProcessAnnotatedTypeObserver.getStatefulSessionBeanEvent() != null; validateStatelessSessionBean(ProcessAnnotatedTypeObserver.getStatelessSessionBeanEvent().getAnnotatedType()); validateStatefulSessionBean(ProcessAnnotatedTypeObserver.getStatefulSessionBeanEvent().getAnnotatedType()); } - + @Test - @SpecAssertion(section = "12.3", id= "bh") - public void testProcessAnnotatedTypeFiredForSessionBeanInterceptor() { + @SpecAssertion(section = "12.3", id = "bh") + public void testProcessAnnotatedTypeFiredForSessionBeanInterceptor() + { assert ProcessAnnotatedTypeObserver.getSessionBeanInterceptorEvent() != null; validateSessionBeanInterceptor(ProcessAnnotatedTypeObserver.getSessionBeanInterceptorEvent().getAnnotatedType()); } - + @Test @SpecAssertion(section = "11.5.8", id = "ba") public void testProcessManagedBeanFired() @@ -118,62 +114,66 @@ assert ProcessBeanObserver.getProcessManagedBeanEvent() != null; validateManagedBean(ProcessBeanObserver.getProcessManagedBeanEvent().getAnnotatedBeanClass()); } - + @Test - @SpecAssertions({ - @SpecAssertion(section="11.5.8", id="c"), - @SpecAssertion(section="12.3", id="fb")}) - public void testProcessSessionBeanFiredForStatelessSessionBean() { + @SpecAssertions( { @SpecAssertion(section = "11.5.8", id = "c"), @SpecAssertion(section = "12.3", id = "fb") }) + public void testProcessSessionBeanFiredForStatelessSessionBean() + { assert ProcessBeanObserver.getProcessStatelessSessionBeanEvent() != null; validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getAnnotatedBeanClass()); } - + @Test - @SpecAssertions({ - @SpecAssertion(section="11.5.8", id="c"), - @SpecAssertion(section="12.3", id="fb") - }) - public void testProcessSessionBeanFiredForStatefulSessionBean() { + @SpecAssertions( { @SpecAssertion(section = "11.5.8", id = "c"), @SpecAssertion(section = "12.3", id = "fb") }) + public void testProcessSessionBeanFiredForStatefulSessionBean() + { assert ProcessBeanObserver.getProcessStatefulSessionBeanEvent() != null; validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getAnnotatedBeanClass()); } - + @Test - @SpecAssertion(section="11.5.8", id="hb") - public void testGetEJBName() { + @SpecAssertion(section = "11.5.8", id = "hb") + public void testGetEJBName() + { assert ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getEjbName().equals("sheep"); assert ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getEjbName().equals("cow"); } - + @Test - @SpecAssertion(section="11.5.8", id="hc") - public void testGetSessionBeanType() { + @SpecAssertion(section = "11.5.8", id = "hc") + public void testGetSessionBeanType() + { assert ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getSessionBeanType().equals(STATELESS); assert ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getSessionBeanType().equals(STATEFUL); } - - private void validateStatelessSessionBean(Annotated type) { + + private void validateStatelessSessionBean(Annotated type) + { assert type.getBaseType().equals(Sheep.class); assert rawTypeSetMatches(type.getTypeClosure(), Sheep.class, SheepLocal.class, Object.class); assert type.getAnnotations().size() == 2; - assert annotationSetMatches(type.getAnnotations(), Tame.class, Stateless.class); //TODO Check + assert annotationSetMatches(type.getAnnotations(), Tame.class, Stateless.class); // TODO + // Check } - - private void validateStatefulSessionBean(Annotated type) { + + private void validateStatefulSessionBean(Annotated type) + { assert type.getBaseType().equals(Cow.class); assert rawTypeSetMatches(type.getTypeClosure(), Cow.class, CowLocal.class, Object.class); assert type.getAnnotations().size() == 0; } - - private void validateSessionBeanInterceptor(AnnotatedType<SheepInterceptor> type) { + + private void validateSessionBeanInterceptor(AnnotatedType<SheepInterceptor> type) + { assert type.getBaseType().equals(SheepInterceptor.class); assert rawTypeSetMatches(type.getTypeClosure(), SheepInterceptor.class, Object.class); assert type.getAnnotations().size() == 0; assert type.getFields().size() == 0; assert type.getMethods().size() == 1; } - - private void validateManagedBean(AnnotatedType<Farm> type) { + + private void validateManagedBean(AnnotatedType<Farm> type) + { assert type.getBaseType().equals(Farm.class); assert rawTypeSetMatches(type.getTypeClosure(), Farm.class, Object.class); assert type.getFields().size() == 1; @@ -181,5 +181,5 @@ assert type.getMethods().size() == 1; assert type.getMethods().iterator().next().isAnnotationPresent(Produces.class); } - + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2010-01-22 16:57:42 UTC (rev 5613) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2010-01-22 16:58:41 UTC (rev 5614) @@ -23,12 +23,12 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DeploymentFailure.class) -@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") +@Extension("javax.enterprise.inject.spi.Extension") @IntegrationTest @SpecVersion(spec = "cdi", version = "20091101") public class AddDefinitionErrorTest extends AbstractJSR299Test

14 years, 11 months

1
0
0 / 0

Weld SVN: r5613 - cdi-tck/trunk/doc/reference/en-US.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:57:42 -0500 (Fri, 22 Jan 2010) New Revision: 5613 Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml Log: port CDITCK-85 to trunk Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml =================================================================== --- cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-01-22 16:56:19 UTC (rev 5612) +++ cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-01-22 16:57:42 UTC (rev 5613) @@ -166,6 +166,20 @@ </para> </section> + + <section> + <title>Using the CDI TCK with the Java EE Web Profile</title> + <para> + You can configure the CDI TCK to just run tests appropriate to the Java EE + Web Profile by adding the <literal>WebProfileMethodSelector</literal> to + TestNG XML configuration file: + </para> + <programlisting><![CDATA[<method-selectors> + <method-selector> + <selector-class name="org.jboss.jsr299.tck.impl.WebProfileMethodSelector" /> + </method-selector> +</method-selectors>]]></programlisting> + </section> <section> <title>Configuring TestNG to execute the TCK</title> @@ -180,7 +194,7 @@ The <literal>tck-tests.xml</literal> artifact provided in the TCK distribution must be run by TestNG 5.9 - (described by the TestNG documenation as "with a + (described by the TestNG documentation as "with a <literal>testng.xml</literal> file") unmodified for an implementation to pass the TCK. This file also allows tests to be excluded from a run:

14 years, 11 months

1
0
0 / 0

Weld SVN: r5612 - in cdi-tck/trunk/impl/src/main: resources and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:56:19 -0500 (Fri, 22 Jan 2010) New Revision: 5612 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java cdi-tck/trunk/impl/src/main/resources/tck-tests.xml Log: port CDITCK-85 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-01-22 16:55:51 UTC (rev 5611) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-01-22 16:56:19 UTC (rev 5612) @@ -39,7 +39,7 @@ private boolean isFullProfileOnly(String[] groups) { - return Arrays.asList(groups).contains("javaee-full"); + return Arrays.asList(groups).contains("javaee-full-only"); } } Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 16:55:51 UTC (rev 5611) +++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 16:56:19 UTC (rev 5612) @@ -6,6 +6,10 @@ <method-selector> <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> </method-selector> +  +  </method-selectors> <packages> <package name="org.jboss.jsr299.tck.tests.*" />

14 years, 11 months

1
0
0 / 0

Weld SVN: r5611 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:55:51 -0500 (Fri, 22 Jan 2010) New Revision: 5611 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java Log: port r5533 to trunk Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java 2010-01-22 16:55:51 UTC (rev 5611) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.lookup.injectionpoint; + +import javax.inject.Inject; + +public class Cattery +{ + + @Inject Cat cat; + + public Cat getCat() + { + return cat; + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-01-22 16:55:21 UTC (rev 5610) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-01-22 16:55:51 UTC (rev 5611) @@ -224,7 +224,7 @@ { assert !getInstanceByType(FieldInjectionPointBean.class).getInjectedBean().getInjectedMetadata().isDelegate(); - Cat cat = getInstanceByType(Cat.class, new DefaultLiteral()); + Cat cat = getInstanceByType(Cattery.class).getCat(); assert cat.hello().equals("hello world!"); assert cat.getBeanManager() != null; assert cat.getInjectionPoint() != null;

14 years, 11 months

1
0
0 / 0

Weld SVN: r5610 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/interceptors/tests/invocationContext and 18 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-01-22 11:55:21 -0500 (Fri, 22 Jan 2010) New Revision: 5610 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java cdi-tck/trunk/impl/src/main/resources/tck-tests.xml Log: port r5523 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -26,9 +26,10 @@ @SpecVersion(spec = "int", version = "3.1.PFD") public class DefinitionTest extends AbstractJSR299Test { - @Test(groups="ri-broken") - @SpecAssertion(section = "1", id= "a") - public void testInterceptorMethodDefinedOnTargetClass() { + @Test + @SpecAssertion(section = "1", id = "a") + public void testInterceptorMethodDefinedOnTargetClass() + { assert getInstanceByType(ClassWithAroundInvokeMethod.class).foo().equals("barbar"); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -43,7 +43,7 @@ assert Interceptor1.isGetTargetOK(); } - @Test(groups="jboss-as-broken") + @Test @SpecAssertion(section = "6", id = "f") public void testGetTimerMethod() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -27,7 +27,7 @@ @SpecVersion(spec = "int", version = "3.1.PFD") public class InvocationOrderTest extends AbstractJSR299Test { - @Test(groups="ri-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "5.1", id = "c"), @SpecAssertion(section = "5.1", id = "d"), Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -41,8 +41,7 @@ * bean, during any call to an EJB timeout method and during message delivery * to any EJB message driven bean. */ - // WELD-12 - @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" }) + @Test(groups = { "contexts", "ejb3.1", "integration" }) @SpecAssertion(section = "6.7.1", id = "gc") public void testRequestScopeActiveDuringCallToEjbTimeoutMethod() throws Exception { @@ -56,8 +55,7 @@ * The request context is destroyed after the remote method invocation, * timeout or message delivery completes. */ - // WELD-12 - @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" }) + @Test(groups = { "contexts", "ejb3.1", "integration" }) @SpecAssertion(section = "6.7.1", id = "hc") public void testRequestScopeDestroyedAfterCallToEjbTimeoutMethod() throws Exception { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -36,9 +36,8 @@ @Extension("javax.enterprise.inject.spi.Extension") public class CustomDecoratorTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test @SpecAssertion(section = "8.3", id = "b") - // WELD-269 public void testCustomImplementationOfDecoratorInterface() { assert getInstanceByType(Vehicle.class).start().equals("Bus started and decorated."); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -35,9 +35,8 @@ @ExpectedDeploymentException(DeploymentFailure.class) public class CustomDecoratorMatchingBeanWithFinalClassTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test @SpecAssertion(section = "8.3", id = "ab") - // WELD-274 public void testCustomDecoratorDecoratingFinalBean() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -36,9 +36,8 @@ public class FinalBeanClassTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test @SpecAssertion(section="8.3", id="ab") - // WELD-272 public void testAppliesToFinalManagedBeanClass() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -36,9 +36,8 @@ public class FinalBeanMethodTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test @SpecAssertion(section="8.3", id="ac") - // WELD-272 public void testAppliesToFinalMethodOnManagedBeanClass() { assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -39,7 +39,7 @@ public class EJBDecoratorInvocationTest extends AbstractJSR299Test { - @Test(groups="ri-broken") + @Test @SpecAssertions({ @SpecAssertion(section="7.2", id="d") }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -60,7 +60,7 @@ return artifact; } - @Test(groups = {"jboss-as-broken"}) + @Test @SpecAssertions({ @SpecAssertion(section = "12.1", id="bbb") }) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -33,7 +33,7 @@ @SpecVersion(spec="cdi", version="20091101") public class SingletonWithRequestScopeTest extends AbstractJSR299Test { - @Test(groups = { "jboss-as-broken" }) + @Test @SpecAssertion(section = "3.2", id = "da") public void testSingletonWithRequestScopeFails() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -33,7 +33,7 @@ @SpecVersion(spec="cdi", version="20091101") public class SingletonWithSessionScopeTest extends AbstractJSR299Test { - @Test(groups = { "jboss-as-broken" }) + @Test @SpecAssertion(section = "3.2", id = "da") public void testSingletonWithSessionScopeFails() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -38,7 +38,7 @@ public class NewEnterpriseBeanICTest extends AbstractJSR299Test { - @Test(groups = { "new", "jboss-as-broken" }) + @Test(groups = { "new" }) @SpecAssertion(section = "3.12", id = "l") public void testNewBeanHasSameConstructor() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -34,7 +34,7 @@ @BeansXml("beans.xml") public class SessionBeanInterceptorOrderTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertion(section = "9.4", id = "fb") public void testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -57,13 +57,12 @@ assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly(); } - //@Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "5.5", id = "ed"), @SpecAssertion(section = "5.5.2", id = "ao"), @SpecAssertion(section = "5.5.2", id = "ap") }) - //JBAS-7046 public void testInjectionOnEJBInterceptor() { // Test interceptor that intercepts contextual Session Bean Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -62,12 +62,11 @@ @SpecVersion(spec = "cdi", version = "20091101") public class ContainerEventTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aac"), @SpecAssertion(section = "11.5.6", id = "abc"), @SpecAssertion(section = "12.3", id = "de")}) - // WELDINT-22 public void testProcessInjectionTargetEventFiredForServletListener() { assert ProcessInjectionTargetObserver.getListenerEvent() != null; @@ -85,36 +84,33 @@ validateTagHandlerAnnotatedType(ProcessInjectionTargetObserver.getTagHandlerEvent().getAnnotatedType()); } - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aae"), @SpecAssertion(section = "11.5.6", id = "abe"), @SpecAssertion(section = "12.3", id = "dg")}) - // WELDINT-22 public void testProcessInjectionTargetEventFiredForTagLibraryListener() { assert ProcessInjectionTargetObserver.getTagLibraryListenerEvent() != null; validateTagLibraryListenerAnnotatedType(ProcessInjectionTargetObserver.getTagLibraryListenerEvent().getAnnotatedType()); } - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aah"), @SpecAssertion(section = "11.5.6", id = "abh"), @SpecAssertion(section = "12.3", id = "dj")}) - // WELDINT-22 public void testProcessInjectionTargetEventFiredForServlet() { assert ProcessInjectionTargetObserver.getServletEvent() != null; validateServletAnnotatedType(ProcessInjectionTargetObserver.getServletEvent().getAnnotatedType()); } - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aai"), @SpecAssertion(section = "11.5.6", id = "abi"), @SpecAssertion(section = "12.3", id = "dk")}) - // WELDINT-22 public void testProcessInjectionTargetEventFiredForFilter() { assert ProcessInjectionTargetObserver.getFilterEvent() != null; @@ -129,13 +125,12 @@ validateJsfManagedBeanAnnotatedType(ProcessInjectionTargetObserver.getJsfManagedBeanEvent().getAnnotatedType()); } - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "11.5.6", id = "aas"), @SpecAssertion(section = "11.5.6", id = "aao"), @SpecAssertion(section = "11.5.6", id = "aan"), @SpecAssertion(section = "11.5.6", id = "aap")}) - // WELDINT-22 public void testTypeOfProcessInjectionTargetParameter() { assert !ProcessInjectionTargetObserver.isStringObserved(); assert ProcessInjectionTargetObserver.isTagHandlerSubTypeObserved(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -37,7 +37,7 @@ @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...") SheepWSEndPointService service; - @Test(groups = "jboss-as-broken") + @Test @SpecAssertions({ @SpecAssertion(section = "5.5", id = "ee"), @SpecAssertion(section = "5.5.2", id = "aq"), Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -28,16 +28,16 @@ import org.testng.annotations.Test; @Artifact -@SpecVersion(spec="cdi", version="20091101") +@SpecVersion(spec = "cdi", version = "20091101") @ExpectedDeploymentException(DeploymentFailure.class) @IntegrationTest @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") public class InjectionPointTest extends AbstractJSR299Test { - @Test(groups = "jboss-as-broken") + @Test @SpecAssertion(section = "5.5.7", id = "ga") - //WELDINT-26 - public void testDefinitionErrorDetected() { + public void testDefinitionErrorDetected() + { assert false; } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2010-01-22 16:55:21 UTC (rev 5610) @@ -27,12 +27,11 @@ @Artifact @IntegrationTest -@SpecVersion(spec="cdi", version="20091101") +@SpecVersion(spec = "cdi", version = "20091101") public class ManagerTest extends AbstractJSR299Test { - @Test(groups = { "manager", "ejb3", "integration", "jboss-as-broken" }) + @Test(groups = { "manager", "ejb3", "integration"}) @SpecAssertion(section = "11.3", id = "da") - // Requires new injection framework carlo is working on I think PLM public void testManagerLookupInJndi() throws Exception { BeanManager beanManager = getInstanceByType(JndiBeanManagerInjected.class).getManagerFromJndi(); Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 16:53:54 UTC (rev 5609) +++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-01-22 16:55:21 UTC (rev 5610) @@ -7,13 +7,9 @@ <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> </method-selector> </method-selectors> - <groups> - <run> - <exclude name="broken" /> - </run> - </groups> <packages> <package name="org.jboss.jsr299.tck.tests.*" /> + <package name="org.jboss.jsr299.tck.interceptors.tests.*" /> </packages> </test>

14 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits January 2010