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

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Fri Jan 22 11:55:22 EST 2010


Author: pete.muir at 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.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl")
    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
- at SpecVersion(spec="cdi", version="20091101")
+ at 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
- at SpecVersion(spec="cdi", version="20091101")
+ at 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>
    



More information about the weld-commits mailing list