Weld SVN: r5609 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken: exceptionInAfterBeanDiscoveryObserver and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:53:54 -0500 (Fri, 22 Jan 2010)
New Revision: 5609
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
Log:
port r5521 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:53:22 UTC (rev 5608)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:53:54 UTC (rev 5609)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
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.jsr299.Extension;
import org.testng.annotations.Test;
@@ -38,6 +39,7 @@
@Extension(value="javax.enterprise.inject.spi.Extension")
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
+@IntegrationTest
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
@Test(groups={"rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:53:22 UTC (rev 5608)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:53:54 UTC (rev 5609)
@@ -22,6 +22,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
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.jsr299.Extension;
import org.testng.annotations.Test;
@@ -36,6 +37,7 @@
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@Extension(value="javax.enterprise.inject.spi.Extension")
+@IntegrationTest
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:53:22 UTC (rev 5608)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:53:54 UTC (rev 5609)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
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.jsr299.Extension;
import org.testng.annotations.Test;
@@ -37,6 +38,7 @@
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@Extension(value="javax.enterprise.inject.spi.Extension")
+@IntegrationTest
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
14 years, 11 months
Weld SVN: r5608 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/byname and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:53:22 -0500 (Fri, 22 Jan 2010)
New Revision: 5608
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
Log:
port CDITCK-91 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2010-01-22 16:52:32 UTC (rev 5607)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2010-01-22 16:53:22 UTC (rev 5608)
@@ -118,7 +118,7 @@
}
}
- assert bean != null;
+ assert bean == null;
assert specializedBean != null;
assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class);
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2010-01-22 16:52:32 UTC (rev 5607)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2010-01-22 16:53:22 UTC (rev 5608)
@@ -44,7 +44,7 @@
{
// Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice
Set<Bean<?>> beans = getCurrentManager().getBeans("whitefish");
- assert beans.size() == 2;
+ assert beans.size() == 1;
assert getCurrentManager().resolve(beans).getTypes().contains(AlaskaPlaice.class);
// Both Salmon and Sole are named "fish" - Sole is an enabled policy
beans = getCurrentManager().getBeans("fish");
14 years, 11 months
Weld SVN: r5607 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:52:32 -0500 (Fri, 22 Jan 2010)
New Revision: 5607
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
Log:
port CDITCK-89 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2010-01-22 16:51:32 UTC (rev 5606)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2010-01-22 16:52:32 UTC (rev 5607)
@@ -92,7 +92,7 @@
public void testProducerPoliciesOnClass() throws Exception
{
assert getBeans(Sheep.class, new AnnotationLiteral<Wild>(){}).size() == 2;
- assert getBeans(Sheep.class, new AnnotationLiteral<Tame>(){}).size() == 2;
+ assert getBeans(Sheep.class, new AnnotationLiteral<Tame>(){}).size() == 0;
}
@Test
@@ -103,6 +103,6 @@
public void testProducerPoliciesOnMethodAndField() throws Exception
{
assert getBeans(Cat.class, new AnnotationLiteral<Wild>(){}).size() == 2;
- assert getBeans(Cat.class, new AnnotationLiteral<Tame>(){}).size() == 2;
+ assert getBeans(Cat.class, new AnnotationLiteral<Tame>(){}).size() == 0;
}
}
14 years, 11 months
Weld SVN: r5605 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:50:57 -0500 (Fri, 22 Jan 2010)
New Revision: 5605
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
Log:
port r5509 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-22 16:50:23 UTC (rev 5604)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2010-01-22 16:50:57 UTC (rev 5605)
@@ -38,8 +38,7 @@
{
@Test
- @SpecAssertions({
- //@SpecAssertion(section = "5.1", id = "b"),
+ @SpecAssertions({
@SpecAssertion(section = "5.1.1", id = "k")
})
public void testGetBeanClassCalled()
@@ -47,9 +46,8 @@
assert IntegerBean.bean.isGetBeanClassCalled();
}
- @Test(groups = { "ri-broken" })
+ @Test
@SpecAssertion(section = "5.1.1", id = "k")
- // WBRI-328
public void testGetStereotypesCalled()
{
assert IntegerBean.bean.isGetStereotypesCalled();
14 years, 11 months
Weld SVN: r5604 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:50:23 -0500 (Fri, 22 Jan 2010)
New Revision: 5604
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
Log:
port r5508 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2010-01-22 16:49:23 UTC (rev 5603)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2010-01-22 16:50:23 UTC (rev 5604)
@@ -29,9 +29,8 @@
@SpecVersion(spec="cdi", version="20091101")
public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "ri-broken"})
+ @Test(groups = { "contexts", "passivation"})
@SpecAssertion(section = "6.6.1", id = "bb")
- // WBRI-361
public void testManagedBeanWithNonSerializableInterceptorClassNotOK()
{
assert false;
14 years, 11 months
Weld SVN: r5603 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:49:23 -0500 (Fri, 22 Jan 2010)
New Revision: 5603
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
Log:
port r5507 to trunk
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2010-01-22 16:48:55 UTC (rev 5602)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2010-01-22 16:49:23 UTC (rev 5603)
@@ -31,7 +31,7 @@
@BeansXml("beans.xml")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @Test(groups = { "contexts", "passivation" })
@SpecAssertion(section = "6.6.4", id = "aac")
public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
{
14 years, 11 months
Weld SVN: r5602 - in cdi-tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/implementation/simple/definition and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:48:55 -0500 (Fri, 22 Jan 2010)
New Revision: 5602
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
Log:
port CDITCK-93 to trunk
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java 2010-01-22 16:48:55 UTC (rev 5602)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.definition;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+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.jsr299.Extension;
+import org.testng.annotations.Test;
+
+@Artifact
+@SpecVersion(spec="cdi", version="20091101")
+@Extension("javax.enterprise.inject.spi.Extension")
+@IntegrationTest
+public class EnterpriseBeanNotDiscoveredAsManagedBeanTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section="3.1.1", id="f")
+ public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
+ {
+ assert !EnterpriseBeanObserver.observedEnterpriseBean;
+ assert EnterpriseBeanObserver.observedAnotherBean;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanNotDiscoveredAsManagedBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java 2010-01-22 16:48:55 UTC (rev 5602)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.definition;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+
+public class EnterpriseBeanObserver implements Extension
+{
+
+ public static boolean observedEnterpriseBean;
+ public static boolean observedAnotherBean;
+
+ public void observeAnotherBean(@Observes ProcessManagedBean<Sheep> event)
+ {
+ observedAnotherBean = true;
+ }
+
+ public void observeEnterpriseBean(@Observes ProcessManagedBean<MockEnterpriseBean> event)
+ {
+ observedEnterpriseBean = true;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/EnterpriseBeanObserver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-01-22 16:48:19 UTC (rev 5601)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2010-01-22 16:48:55 UTC (rev 5602)
@@ -62,14 +62,6 @@
assert getBeans(Car.class).size() == 0;
}
- @Test(groups = "broken")
- // TODO The bean will be discovered, just not as a managed bean. This test is doesn't check that *at all*
- @SpecAssertion(section="3.1.1", id="f")
- public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
- {
- assert getBeans(MockEnterpriseBean.class).size() == 0;
- }
-
@Test
@SpecAssertion(section="3.1.1", id="p")
public void testSimpleBeanOnlyIfConstructorParameterless()
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/definition/javax.enterprise.inject.spi.Extension 2010-01-22 16:48:55 UTC (rev 5602)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.implementation.simple.definition.EnterpriseBeanObserver
14 years, 11 months
Weld SVN: r5600 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-22 11:47:14 -0500 (Fri, 22 Jan 2010)
New Revision: 5600
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
port r5504 to trunk
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2010-01-22 16:46:44 UTC (rev 5599)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2010-01-22 16:47:14 UTC (rev 5600)
@@ -4431,7 +4431,7 @@
<group>
<text>A raw bean type is considered assignable to a parameterized delegate type if the raw types are identical and all type parameters of the delegate type are either unbounded type variables or |java.lang.Object|.</text>
- <assertion id="ab">
+ <assertion id="aa">
<text>Check all type parameters are unbounded type variables</text>
</assertion>
14 years, 11 months