Weld SVN: r5539 - in cdi-tck/branches/1.0/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-20 17:20:09 -0500 (Wed, 20 Jan 2010)
New Revision: 5539
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java
Log:
CDITCK-78, and switch to always using @Extension
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -10,7 +10,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;
/**
@@ -22,7 +22,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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -13,15 +13,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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -11,7 +11,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;
/**
@@ -23,7 +23,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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -8,8 +8,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;
/**
@@ -20,9 +19,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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2010-01-20 21:23:51 UTC (rev 5538)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2010-01-20 22:20:09 UTC (rev 5539)
@@ -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
16 years, 2 months
- 1
- 0
Weld SVN: r5538 - in core/trunk/tests/src/test: java/org/jboss/weld/tests/decorators/interceptor and 2 other directories.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2010-01-20 16:23:51 -0500 (Wed, 20 Jan 2010)
New Revision: 5538
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java
core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/
core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml
Log:
Tests for WELD-314
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Intercepted.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Inherited
+@InterceptorBinding
+(a)Target({ElementType.TYPE, ElementType.METHOD})
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface Intercepted
+{
+}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java (from rev 5529, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+public class InterceptorAndDecoratorTest extends AbstractWeldTest
+{
+
+ @Test(description="WELD-314", groups = "broken")
+ public void test()
+ {
+ ServiceImpl.invocationCount = 0;
+ ServiceDecorator.invocationCount = 0;
+ ServiceInterceptor.invocationCount = 0;
+ getReference(Service.class).execute();
+ assert ServiceImpl.invocationCount == 1;
+ assert ServiceDecorator.invocationCount == 1;
+ assert ServiceInterceptor.invocationCount == 1;
+ }
+
+}
\ No newline at end of file
Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java (from rev 5529, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/PaymentService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+public interface Service
+{
+ void execute();
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/Service.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java (from rev 5529, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/SecurePaymentService.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * Secure PaymentService implemented by decator
+ *
+ * @author wayne
+ */
+@Decorator
+class ServiceDecorator implements Service
+{
+
+ @Inject
+ @Delegate
+ private Service service;
+
+ public static int invocationCount = 0;
+
+ public void execute()
+ {
+ invocationCount++;
+ service.execute();
+ }
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceDecorator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceImpl.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+public class ServiceImpl implements Service
+{
+
+ public static int invocationCount = 0;
+
+ @Intercepted
+ public void execute()
+ {
+ invocationCount ++;
+ }
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/interceptor/ServiceInterceptor.java 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.tests.decorators.interceptor;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Intercepted @Interceptor
+public class ServiceInterceptor
+{
+
+ public static int invocationCount = 0;
+
+ @AroundInvoke
+ public Object interceptService(InvocationContext invocationContext) throws Exception
+ {
+ this.invocationCount++;
+ return invocationContext.proceed();
+ }
+
+}
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml (from rev 5529, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/stackoverflow/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/interceptor/beans.xml 2010-01-20 21:23:51 UTC (rev 5538)
@@ -0,0 +1,8 @@
+<beans>
+ <decorators>
+ <class>org.jboss.weld.tests.decorators.interceptor.ServiceDecorator</class>
+ </decorators>
+ <interceptors>
+ <class>org.jboss.weld.tests.decorators.interceptor.ServiceInterceptor</class>
+ </interceptors>
+</beans>
\ No newline at end of file
16 years, 2 months
- 1
- 0
Weld SVN: r5537 - cdi-tck/branches/1.0/doc/reference/en-US.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 13:37:51 -0500 (Wed, 20 Jan 2010)
New Revision: 5537
Modified:
cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml
Log:
CDITCK-85
Modified: cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml 2010-01-20 18:20:45 UTC (rev 5536)
+++ cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml 2010-01-20 18:37:51 UTC (rev 5537)
@@ -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:
16 years, 2 months
- 1
- 0
Weld SVN: r5536 - in cdi-tck/branches/1.0/impl/src/main: resources and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 13:20:45 -0500 (Wed, 20 Jan 2010)
New Revision: 5536
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-85
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-01-20 17:52:43 UTC (rev 5535)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-01-20 18:20:45 UTC (rev 5536)
@@ -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/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-01-20 17:52:43 UTC (rev 5535)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-01-20 18:20:45 UTC (rev 5536)
@@ -6,6 +6,10 @@
<method-selector>
<selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
</method-selector>
+ <!-- Uncomment if you want to run the TCK against a web profile impl -->
+ <!-- <method-selector>
+ <selector-class name="org.jboss.jsr299.tck.impl.WebProfileMethodSelector" />
+ </method-selector>-->
</method-selectors>
<packages>
<package name="org.jboss.jsr299.tck.tests.*" />
16 years, 2 months
- 1
- 0
Weld SVN: r5535 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 12:52:43 -0500 (Wed, 20 Jan 2010)
New Revision: 5535
Modified:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
Log:
missing two excludes
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-20 17:22:31 UTC (rev 5534)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-20 17:52:43 UTC (rev 5535)
@@ -118,6 +118,18 @@
<exclude name="testInjectionIntoWebServiceEndpoint" />
</methods>
</class>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
+ <methods>
+ <exclude name="testInjectionOnEJBInterceptor" />
+ </methods>
+ </class>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
+ <methods>
+ <exclude name="testApplicationScopeActiveDuringWebServiceInvocation" />
+ </methods>
+ </class>
<!-- WELDINT-22 -->
<class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
<methods>
16 years, 2 months
- 1
- 0
Weld SVN: r5534 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 12:22:31 -0500 (Wed, 20 Jan 2010)
New Revision: 5534
Modified:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
Log:
minor updates
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-20 17:03:09 UTC (rev 5533)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-20 17:22:31 UTC (rev 5534)
@@ -17,13 +17,6 @@
<!-- Issues in Weld (the RI) -->
- <!-- WELD-395 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest">
- <methods>
- <exclude name="testDecoratorIsManagedBean" />
- </methods>
- </class>
-
<!-- WELD-393 -->
<class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
<methods>
@@ -31,25 +24,12 @@
</methods>
</class>
- <!-- WELD-394 -->
- <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testDependentScopedDecoratorsAreDependentObjectsOfBean" />
- </methods>
- </class>
-
<!-- WELD-390 -->
<class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
<methods>
<exclude name="testInvocationOrder" />
</methods>
</class>
- <!-- WELD-274 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass.CustomDecoratorMatchingBeanWithFinalClassTest">
- <methods>
- <exclude name="testCustomDecoratorDecoratingFinalBean" />
- </methods>
- </class>
<!-- WELD-269 -->
<class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
<methods>
@@ -67,7 +47,7 @@
<exclude name="testAppliesToFinalMethodOnManagedBeanClass" />
</methods>
</class>
- <!-- WELD-391 -->
+ <!-- WELD-377 -->
<class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
<methods>
<exclude name="testEJBDecoratorInvocation" />
16 years, 2 months
- 1
- 0
Weld SVN: r5533 - cdi-tck/branches/1.0/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-20 12:03:09 -0500 (Wed, 20 Jan 2010)
New Revision: 5533
Added:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
Log:
minor
Added: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java 2010-01-20 17:03:09 UTC (rev 5533)
@@ -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/branches/1.0/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/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-01-20 17:01:03 UTC (rev 5532)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-01-20 17:03:09 UTC (rev 5533)
@@ -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;
16 years, 2 months
- 1
- 0
Weld SVN: r5532 - core/trunk/impl/src/main/java/org/jboss/weld/bean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 12:01:03 -0500 (Wed, 20 Jan 2010)
New Revision: 5532
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
Log:
Wrap injection in correct IP as well
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-20 17:00:17 UTC (rev 5531)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-20 17:01:03 UTC (rev 5532)
@@ -70,13 +70,185 @@
/**
* Represents a simple bean
- *
+ *
* @author Pete Muir
* @author Marius Bogoevici
* @param <T> The type (class) of the bean
*/
public class ManagedBean<T> extends AbstractClassBean<T>
{
+
+ private static abstract class FixInjectionPoint<T>
+ {
+
+ private final AbstractClassBean<T> bean;
+
+ private InjectionPoint originalInjectionPoint;
+
+ private FixInjectionPoint(AbstractClassBean<T> bean)
+ {
+ this.bean = bean;
+ }
+
+ protected abstract T work();
+
+ private void setup()
+ {
+ if (bean.hasDecorators())
+ {
+ Decorator<?> decorator = bean.getDecorators().get(bean.getDecorators().size() - 1);
+ InjectionPoint outerDelegateInjectionPoint = Beans.getDelegateInjectionPoint(decorator);
+ if (outerDelegateInjectionPoint == null)
+ {
+ throw new ForbiddenStateException(DELEGATE_INJECTION_POINT_NOT_FOUND, decorator);
+ }
+ CurrentInjectionPoint currentInjectionPoint = Container.instance().services().get(CurrentInjectionPoint.class);
+ if (currentInjectionPoint.peek() != null)
+ {
+ this.originalInjectionPoint = currentInjectionPoint.pop();
+ currentInjectionPoint.push(outerDelegateInjectionPoint);
+ }
+ else
+ {
+ currentInjectionPoint.push(outerDelegateInjectionPoint);
+ }
+ }
+ }
+
+ public InjectionPoint getOriginalInjectionPoint()
+ {
+ return originalInjectionPoint;
+ }
+
+ private void cleanup()
+ {
+ if (bean.hasDecorators())
+ {
+ Container.instance().services().get(CurrentInjectionPoint.class).pop();
+ Container.instance().services().get(CurrentInjectionPoint.class).push(originalInjectionPoint);
+ }
+ }
+
+ public T run()
+ {
+ try
+ {
+ setup();
+ return work();
+ }
+ finally
+ {
+ cleanup();
+ }
+
+ }
+
+ }
+
+ private static class ManagedBeanInjectionTarget<T> implements InjectionTarget<T>
+ {
+
+ private final ManagedBean<T> bean;
+
+ private ManagedBeanInjectionTarget(ManagedBean<T> bean)
+ {
+ this.bean = bean;
+ }
+
+ public void inject(final T instance, final CreationalContext<T> ctx)
+ {
+ new FixInjectionPoint<T>(bean)
+ {
+
+ @Override
+ protected T work()
+ {
+ new InjectionContextImpl<T>(bean.getBeanManager(), ManagedBeanInjectionTarget.this, instance)
+ {
+
+ public void proceed()
+ {
+ Beans.injectEEFields(instance, bean.getBeanManager(), bean.ejbInjectionPoints, bean.persistenceContextInjectionPoints, bean.persistenceUnitInjectionPoints, bean.resourceInjectionPoints);
+ Beans.injectFieldsAndInitializers(instance, ctx, bean.getBeanManager(), bean.getInjectableFields(), bean.getInitializerMethods());
+ }
+
+ }.run();
+ return null;
+ }
+ }.run();
+ ;
+ }
+
+ public void postConstruct(T instance)
+ {
+ if (bean.isInterceptionCandidate() && (bean.hasCdiBoundInterceptors() || bean.hasDirectlyDefinedInterceptors()))
+ {
+ InterceptionUtils.executePostConstruct(instance);
+ }
+ else
+ {
+ bean.defaultPostConstruct(instance);
+ }
+ }
+
+ public void preDestroy(T instance)
+ {
+ if (!bean.isInterceptionCandidate() || !(bean.hasCdiBoundInterceptors() || bean.hasDirectlyDefinedInterceptors()))
+ {
+ bean.defaultPreDestroy(instance);
+ }
+ else
+ {
+ InterceptionUtils.executePredestroy(instance);
+ }
+ }
+
+ public void dispose(T instance)
+ {
+ // No-op
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return (Set) bean.getWeldInjectionPoints();
+ }
+
+ public T produce(final CreationalContext<T> ctx)
+ {
+ final T instance = bean.createInstance(ctx);
+ if (!bean.hasDecorators())
+ {
+ // This should be safe, but needs verification PLM
+ // Without this, the chaining of decorators will fail as the
+ // incomplete instance will be resolved
+ ctx.push(instance);
+ }
+
+ T decoratedInstance = new FixInjectionPoint<T>(bean)
+ {
+
+ @Override
+ protected T work()
+ {
+ if (bean.hasDecorators())
+ {
+ return bean.applyDecorators(instance, ctx, getOriginalInjectionPoint());
+ }
+ return instance;
+ }
+
+ }.run();
+ if (bean.isInterceptionCandidate() && (bean.hasCdiBoundInterceptors() || bean.hasDirectlyDefinedInterceptors()))
+ {
+ return bean.applyInterceptors(decoratedInstance, ctx);
+ }
+ else
+ {
+ return decoratedInstance;
+ }
+ }
+ }
+
// Logger
private static final LocLogger log = loggerFactory().getLogger(BEAN);
private static final XLogger xLog = loggerFactory().getXLogger(BEAN);
@@ -88,13 +260,13 @@
private Set<WeldInjectionPoint<?, ?>> resourceInjectionPoints;
private ManagedBean<?> specializedBean;
-
+
private boolean passivationCapableBean;
private boolean passivationCapableDependency;
/**
* Creates a simple, annotation defined Web Bean
- *
+ *
* @param <T> The type
* @param clazz The class
* @param beanManager the current manager
@@ -111,7 +283,7 @@
return new ManagedBean<T>(clazz, createId(ManagedBean.class.getSimpleName(), clazz), beanManager);
}
}
-
+
protected static String createSimpleId(String beanType, WeldClass<?> clazz)
{
return new StringBuilder().append(beanType).append(BEAN_ID_SEPARATOR).append(clazz.getBaseType()).toString();
@@ -128,7 +300,7 @@
/**
* Constructor
- *
+ *
* @param type The type of the bean
* @param beanManager The Bean manager
*/
@@ -143,7 +315,7 @@
/**
* Creates an instance of the bean
- *
+ *
* @return The instance
*/
public T create(CreationalContext<T> creationalContext)
@@ -154,31 +326,9 @@
return instance;
}
- protected InjectionPoint attachCorrectInjectionPoint()
- {
- Decorator<?> decorator = getDecorators().get(getDecorators().size() - 1);
- InjectionPoint outerDelegateInjectionPoint = Beans.getDelegateInjectionPoint(decorator);
- if (outerDelegateInjectionPoint == null)
- {
- throw new ForbiddenStateException(DELEGATE_INJECTION_POINT_NOT_FOUND, decorator);
- }
- CurrentInjectionPoint currentInjectionPoint = Container.instance().services().get(CurrentInjectionPoint.class);
- if (currentInjectionPoint.peek() != null)
- {
- InjectionPoint originalInjectionPoint = currentInjectionPoint.pop();
- currentInjectionPoint.push(outerDelegateInjectionPoint);
- return originalInjectionPoint;
- }
- else
- {
- currentInjectionPoint.push(outerDelegateInjectionPoint);
- return null;
- }
- }
-
/**
* Destroys an instance of the bean
- *
+ *
* @param instance The instance
*/
public void destroy(T instance, CreationalContext<T> creationalContext)
@@ -213,93 +363,11 @@
{
initDirectlyDefinedInterceptors();
}
- setInjectionTarget(new InjectionTarget<T>()
- {
-
- public void inject(final T instance, final CreationalContext<T> ctx)
- {
- new InjectionContextImpl<T>(getBeanManager(), this, instance)
- {
-
- public void proceed()
- {
- Beans.injectEEFields(instance, getBeanManager(), ejbInjectionPoints, persistenceContextInjectionPoints, persistenceUnitInjectionPoints, resourceInjectionPoints);
- Beans.injectFieldsAndInitializers(instance, ctx, getBeanManager(), getInjectableFields(), getInitializerMethods());
- }
-
- }.run();
- }
-
- public void postConstruct(T instance)
- {
- if (isInterceptionCandidate() && (hasCdiBoundInterceptors() || hasDirectlyDefinedInterceptors()))
- {
- InterceptionUtils.executePostConstruct(instance);
- }
- else
- {
- defaultPostConstruct(instance);
- }
- }
-
- public void preDestroy(T instance)
- {
- if (!isInterceptionCandidate() || !(hasCdiBoundInterceptors() || hasDirectlyDefinedInterceptors()))
- {
- defaultPreDestroy(instance);
- }
- else
- {
- InterceptionUtils.executePredestroy(instance);
- }
- }
-
- public void dispose(T instance)
- {
- // No-op
- }
-
- public Set<InjectionPoint> getInjectionPoints()
- {
- return (Set) getWeldInjectionPoints();
- }
-
- public T produce(CreationalContext<T> ctx)
- {
- T instance = ManagedBean.this.createInstance(ctx);
- if (!hasDecorators())
- {
- // This should be safe, but needs verification PLM
- // Without this, the chaining of decorators will fail as the incomplete instance will be resolved
- ctx.push(instance);
- }
-
- if (hasDecorators())
- {
- InjectionPoint originalInjectionPoint = null;
- try
- {
- originalInjectionPoint = attachCorrectInjectionPoint();
- instance = applyDecorators(instance, ctx, originalInjectionPoint);
-
- }
- finally
- {
- Container.instance().services().get(CurrentInjectionPoint.class).pop();
- Container.instance().services().get(CurrentInjectionPoint.class).push(originalInjectionPoint);
- }
- }
- if (isInterceptionCandidate() && (hasCdiBoundInterceptors() || hasDirectlyDefinedInterceptors()))
- {
- instance = applyInterceptors(instance, ctx);
- }
- return instance;
- }
- });
+ setInjectionTarget(new ManagedBeanInjectionTarget<T>(this));
}
}
- protected T createInstance(CreationalContext<T> ctx)
+ protected T createInstance(CreationalContext<T> ctx)
{
return getConstructor().newInstance(beanManager, ctx);
}
@@ -312,7 +380,7 @@
{
for (Decorator<?> decorator : this.getDecorators())
{
- if (!(PassivationCapable.class.isAssignableFrom(decorator.getClass())) || !((WeldDecorator<?>)decorator).getWeldAnnotated().isSerializable())
+ if (!(PassivationCapable.class.isAssignableFrom(decorator.getClass())) || !((WeldDecorator<?>) decorator).getWeldAnnotated().isSerializable())
{
this.passivationCapableBean = false;
break;
@@ -323,7 +391,7 @@
{
for (SerializableContextual<Interceptor<?>, ?> interceptor : getBeanManager().getCdiInterceptorsRegistry().getInterceptionModel(getType()).getAllInterceptors())
{
- if (!(PassivationCapable.class.isAssignableFrom(interceptor.get().getClass())) || !((InterceptorImpl<?>)interceptor.get()).isSerializable())
+ if (!(PassivationCapable.class.isAssignableFrom(interceptor.get().getClass())) || !((InterceptorImpl<?>) interceptor.get()).isSerializable())
{
this.passivationCapableBean = false;
break;
@@ -359,13 +427,13 @@
this.passivationCapableDependency = false;
}
}
-
+
@Override
public boolean isPassivationCapableBean()
{
return passivationCapableBean;
}
-
+
@Override
public boolean isPassivationCapableDependency()
{
@@ -380,9 +448,6 @@
this.resourceInjectionPoints = Beans.getResourceInjectionPoints(this, getWeldAnnotated(), beanManager);
}
-
-
-
/**
* Validates the type
*/
@@ -474,7 +539,8 @@
if (!(specializedBean instanceof ManagedBean<?>))
{
throw new DefinitionException(SPECIALIZING_BEAN_MUST_EXTEND_A_BEAN, this);
- } else
+ }
+ else
{
this.specializedBean = (ManagedBean<?>) specializedBean;
}
@@ -496,7 +562,7 @@
{
try
{
- List<InterceptorRegistry<Class<?>, ?>> interceptionRegistries = new ArrayList<InterceptorRegistry<Class<?>,?>>();
+ List<InterceptorRegistry<Class<?>, ?>> interceptionRegistries = new ArrayList<InterceptorRegistry<Class<?>, ?>>();
List<InterceptionHandlerFactory<?>> interceptionHandlerFactories = new ArrayList<InterceptionHandlerFactory<?>>();
if (hasDirectlyDefinedInterceptors())
{
@@ -511,7 +577,8 @@
if (interceptionRegistries.size() > 0)
instance = new InterceptorProxyCreatorImpl(interceptionRegistries, interceptionHandlerFactories).createProxyFromInstance(instance, getType());
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new DeploymentException(e);
}
16 years, 2 months
- 1
- 0
Weld SVN: r5531 - in core/trunk/tests/src/test/java/org/jboss/weld/tests: activities/current and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 12:00:17 -0500 (Wed, 20 Jan 2010)
New Revision: 5531
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/tests/TestableObserverMethod.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java
Log:
Move into package to fix incontainer run
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/TestableObserverMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/TestableObserverMethod.java 2010-01-20 16:59:26 UTC (rev 5530)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/TestableObserverMethod.java 2010-01-20 17:00:17 UTC (rev 5531)
@@ -1,10 +0,0 @@
-package org.jboss.weld.tests;
-
-import javax.enterprise.inject.spi.ObserverMethod;
-
-public interface TestableObserverMethod<T> extends ObserverMethod<T>
-{
-
- public boolean isObserved();
-
-}
\ No newline at end of file
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java 2010-01-20 16:59:26 UTC (rev 5530)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/EventCurrentActivityTest.java 2010-01-20 17:00:17 UTC (rev 5531)
@@ -15,7 +15,6 @@
import org.jboss.weld.literal.AnyLiteral;
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.tests.TestableObserverMethod;
import org.testng.annotations.Test;
/**
Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java (from rev 5511, core/trunk/tests/src/test/java/org/jboss/weld/tests/TestableObserverMethod.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java 2010-01-20 17:00:17 UTC (rev 5531)
@@ -0,0 +1,10 @@
+package org.jboss.weld.tests.activities.current;
+
+import javax.enterprise.inject.spi.ObserverMethod;
+
+public interface TestableObserverMethod<T> extends ObserverMethod<T>
+{
+
+ public boolean isObserved();
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/TestableObserverMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 2 months
- 1
- 0
Weld SVN: r5530 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 11:59:26 -0500 (Wed, 20 Jan 2010)
New Revision: 5530
Added:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
Log:
version of tck-tests.xml for TCK 1.0.1
Added: core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml (rev 0)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml 2010-01-20 16:59:26 UTC (rev 5530)
@@ -0,0 +1,167 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<!-- JSR-299 TCK TestNG configuration for Weld -->
+
+<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>
+
+ <!-- Issues in Weld (the RI) -->
+
+ <!-- WELD-395 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest">
+ <methods>
+ <exclude name="testDecoratorIsManagedBean" />
+ </methods>
+ </class>
+
+ <!-- WELD-393 -->
+ <class name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
+ <methods>
+ <exclude name="testInterceptorMethodDefinedOnTargetClass" />
+ </methods>
+ </class>
+
+ <!-- WELD-394 -->
+ <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
+ <methods>
+ <exclude name="testDependentScopedDecoratorsAreDependentObjectsOfBean" />
+ </methods>
+ </class>
+
+ <!-- WELD-390 -->
+ <class name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
+ <methods>
+ <exclude name="testInvocationOrder" />
+ </methods>
+ </class>
+ <!-- WELD-274 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.custom.broken.finalBeanClass.CustomDecoratorMatchingBeanWithFinalClassTest">
+ <methods>
+ <exclude name="testCustomDecoratorDecoratingFinalBean" />
+ </methods>
+ </class>
+ <!-- WELD-269 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
+ <methods>
+ <exclude name="testCustomImplementationOfDecoratorInterface" />
+ </methods>
+ </class>
+ <!-- WELD-272 -->
+ <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>
+ <!-- WELD-391 -->
+ <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
+ <methods>
+ <exclude name="testEJBDecoratorInvocation" />
+ </methods>
+ </class>
+
+ <!-- Issues in JBoss AS -->
+
+ <!-- JBAS-7421 -->
+ <class name="org.jboss.jsr299.tck.interceptors.tests.invocationContext.InvocationContextTest">
+ <methods>
+ <exclude name="testGetTimerMethod" />
+ </methods>
+ </class>
+
+ <!-- Requires EJB 3.1 -->
+
+ <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
+ <methods>
+ <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod" />
+ <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithRequestScope.SingletonWithRequestScopeTest">
+ <methods>
+ <exclude name="testSingletonWithRequestScopeFails" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.broken.singletonWithSessionScope.SingletonWithSessionScopeTest">
+ <methods>
+ <exclude name="testSingletonWithSessionScopeFails" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
+ <methods>
+ <exclude name="testEnterpriseBeanClassLocalView" />
+ <!-- WELDINT-31 -->
+ <exclude name="testConstructorAnnotatedInjectCalled" />
+ </methods>
+ </class>
+ <!-- WELDINT-1 -->
+ <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
+ <methods>
+ <exclude name="test" />
+ </methods>
+ </class>
+ <!-- WELDINT-31 -->
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
+ <methods>
+ <exclude name="testNewBeanHasSameConstructor" />
+ </methods>
+ </class>
+ <!-- WELDINT-27 -->
+ <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest">
+ <methods>
+ <exclude name="testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding" />
+ </methods>
+ </class>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
+ <methods>
+ <exclude name="" />
+ </methods>
+ </class>
+ <!-- JBAS-7046 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
+ <methods>
+ <exclude name="testInjectionIntoWebServiceEndpoint" />
+ </methods>
+ </class>
+ <!-- WELDINT-22 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
+ <methods>
+ <exclude name="testProcessInjectionTargetEventFiredForServletListener" />
+ <exclude name="testProcessInjectionTargetEventFiredForTagLibraryListener" />
+ <exclude name="testProcessInjectionTargetEventFiredForFilter" />
+ <exclude name="testTypeOfProcessInjectionTargetParameter" />
+ <exclude name="testProcessInjectionTargetEventFiredForServlet" />
+ </methods>
+ </class>
+ <!-- WELDINT-26 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
+ <methods>
+ <exclude name="testDefinitionErrorDetected" />
+ </methods>
+ </class>
+ <!-- WELDINT-19 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
+ <methods>
+ <exclude name="testManagerLookupInJndi" />
+ </methods>
+ </class>
+
+ </classes>
+ </test>
+
+</suite>
Property changes on: core/trunk/jboss-tck-runner/src/test/resources/tck-tests-1.0.1.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 2 months
- 1
- 0