[weld-commits] Weld SVN: r5597 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken: exception and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-22 11:45:45 -0500 (Fri, 22 Jan 2010)
New Revision: 5597

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
Log:
port CDITCK-68 to trunk

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java	2010-01-22 16:45:16 UTC (rev 5596)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java	2010-01-22 16:45:45 UTC (rev 5597)
@@ -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,15 +35,13 @@
  */
 @Artifact
 @ExpectedDeploymentException(DeploymentFailure.class)
- at Resources({
-   @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
-})
+ at Extension("javax.enterprise.inject.spi.Extension")
 @IntegrationTest
 @SpecVersion(spec="cdi", version="20091101")
 public class ProcessObserverMethodErrorTest extends AbstractJSR299Test
 {
 
-   @Test(groups = "jboss-as-broken")
+   @Test
    @SpecAssertion(section = "11.5.9", id = "da")
    public void testAddDefinitionError()
    {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java	2010-01-22 16:45:16 UTC (rev 5596)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java	2010-01-22 16:45:45 UTC (rev 5597)
@@ -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;
 
 /**
@@ -37,15 +36,13 @@
  */
 @Artifact
 @ExpectedDeploymentException(DeploymentFailure.class)
- at Resources({
-   @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
-})
+ at Extension("javax.enterprise.inject.spi.Extension")
 @IntegrationTest
 @SpecVersion(spec="cdi", version="20091101")
 public class ProcessObserverMethodExceptionTest extends AbstractJSR299Test
 {
 
-   @Test(groups = "jboss-as-broken")
+   @Test
    @SpecAssertion(section = "11.5.9", id = "db")
    public void testExceptionIsDefinitionError()
    {