12:39 a.m.
Author: marius.bogoevici
Date: 2009-12-15 01:39:27 -0500 (Tue, 15 Dec 2009)
New Revision: 5294
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
Log:
WELD-339. Generic bean injection fixes + tests enabled in core-test + tests disabled in
jboss-tck-runner (must be re-enabled once TCK 1.1.0 is used)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
===================================================================
---
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2009-12-15
06:07:38 UTC (rev 5293)
+++
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2009-12-15
06:39:27 UTC (rev 5294)
@@ -699,6 +699,14 @@
return true;
}
}
+ else if (type2 instanceof TypeVariable)
+ {
+ TypeVariable typeVariable = (TypeVariable) type2;
+ if (isTypeBounded(rawType1, actualTypeArguments1, typeVariable.getBounds()))
+ {
+ return true;
+ }
+ }
return false;
}
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-12-15 06:07:38 UTC
(rev 5293)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2009-12-15 06:39:27 UTC
(rev 5294)
@@ -13,7 +13,7 @@
<run>
<exclude name="broken" />
<exclude name="ri-broken" />
- <exclude name="jboss-as-broken" />
+ <exclude name="jboss-as-broken" />
</run>
</groups>
<packages>
@@ -27,6 +27,41 @@
<exclude name="testGetTimerMethod" />
</methods>
</class>
+ <!-- T
+ The following tests are broken in TCK 1.0.0 and succeed because of a bug
in the 1.0.0 version of the RI
+ The fix for the 1.0.1 version of the RI requires version 1.1.0 of the
TCK.
+ The tests must be re-enabled once the 1.1.0 version of the TCK is used.
+ -->
+ <class
name="org.jboss.jsr299.tck.tests.implementation.producer.field.definition.ProducerFieldDefinitionTest">
+ <methods>
+ <exclude name="testApiTypeForArrayTypeReturn"/>
+ <exclude name="testApiTypeForClassReturn"/>
+ <exclude name="testApiTypeForInterfaceReturn"/>
+ <exclude name="testApiTypeForPrimitiveReturn"/>
+ <exclude name="testBeanDeclaresMultipleProducerFields"/>
+ <exclude name="testBindingType"/>
+ <exclude name="testDefaultBindingType"/>
+ <exclude name="testDefaultNamedField"/>
+ <exclude name="testNamedField"/>
+ <exclude
name="testNonStaticProducerFieldNotIndirectlyInherited"/>
+ <exclude name="testNonStaticProducerFieldNotInherited"/>
+ <exclude name="testParameterizedReturnType"/>
+ <exclude name="testScopeType"/>
+ <exclude name="testStereotype"/>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.ProducerMethodDefinitionTest">
+ <methods>
+ <exclude name="testParameterizedReturnType"/>
+ </methods>
+ </class>
+ <class
name="org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.ResolutionByTypeTest">
+ <methods>
+ <exclude name="testGenericBeanTypesOnManagedBean"/>
+ <exclude name="testResolveByTypeWithTypeParameter"/>
+ </methods>
+ </class>
+
</classes>
</test>
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
===================================================================
---
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2009-12-15
06:07:38 UTC (rev 5293)
+++
core/trunk/tests/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2009-12-15
06:39:27 UTC (rev 5294)
@@ -28,7 +28,7 @@
public class GenericBeanTest extends AbstractWeldTest
{
- @Test(groups = "broken")
+ @Test
public void testGenericBean()
{
TestBean testBean = getCurrentManager().getInstanceByType(TestBean.class);