[weld-commits] Weld SVN: r4764 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event and 4 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Sat Nov 7 19:24:47 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-07 19:24:46 -0500 (Sat, 07 Nov 2009)
New Revision: 4764
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
Log:
WELD-264
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -92,7 +92,7 @@
return annotationTypeList.size() == 0;
}
- public boolean typeSetMatches(Set<Type> types, Class<?>... requiredTypes)
+ public boolean rawTypeSetMatches(Set<Type> types, Class<?>... requiredTypes)
{
List<Class<?>> typeList = new ArrayList<Class<?>>();
typeList.addAll(Arrays.asList(requiredTypes));
@@ -109,6 +109,12 @@
}
return typeList.size() == 0;
}
+
+ public boolean typeSetMatches(Set<Type> types, Type... requiredTypes)
+ {
+ List<Type> typeList = Arrays.asList(requiredTypes);
+ return types.containsAll(typeList);
+ }
public <T> Bean<T> getUniqueBean(Class<T> type, Annotation... bindings)
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -154,20 +154,20 @@
private void validateStatelessSessionBean(Annotated type) {
assert type.getBaseType().equals(Sheep.class);
- assert typeSetMatches(type.getTypeClosure(), Sheep.class, SheepLocal.class, Object.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
}
private void validateStatefulSessionBean(Annotated type) {
assert type.getBaseType().equals(Cow.class);
- assert typeSetMatches(type.getTypeClosure(), Cow.class, CowLocal.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), Cow.class, CowLocal.class, Object.class);
assert type.getAnnotations().size() == 0;
}
private void validateSessionBeanInterceptor(AnnotatedType<SheepInterceptor> type) {
assert type.getBaseType().equals(SheepInterceptor.class);
- assert typeSetMatches(type.getTypeClosure(), SheepInterceptor.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), SheepInterceptor.class, Object.class);
assert type.getAnnotations().size() == 0;
assert type.getFields().size() == 0;
assert type.getMethods().size() == 1;
@@ -175,7 +175,7 @@
private void validateManagedBean(AnnotatedType<Farm> type) {
assert type.getBaseType().equals(Farm.class);
- assert typeSetMatches(type.getTypeClosure(), Farm.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), Farm.class, Object.class);
assert type.getFields().size() == 1;
assert type.getFields().iterator().next().isAnnotationPresent(Produces.class);
assert type.getMethods().size() == 1;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -200,14 +200,14 @@
private void validateTagHandlerAnnotatedType(AnnotatedType<TestTagHandler> type) {
assert type.getBaseType().equals(TestTagHandler.class);
- assert typeSetMatches(type.getTypeClosure(), TestTagHandler.class, SimpleTagSupport.class, SimpleTag.class, JspTag.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), TestTagHandler.class, SimpleTagSupport.class, SimpleTag.class, JspTag.class);
assert type.getAnnotations().size() == 1;
assert type.isAnnotationPresent(Any.class);
}
private void validateTagLibraryListenerAnnotatedType(AnnotatedType<TagLibraryListener> type) {
assert type.getBaseType().equals(TagLibraryListener.class);
- assert typeSetMatches(type.getTypeClosure(), TagLibraryListener.class, ServletContextListener.class, EventListener.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), TagLibraryListener.class, ServletContextListener.class, EventListener.class, Object.class);
assert type.getFields().size() == 1;
assert type.getFields().iterator().next().getJavaMember().getName().equals("sheep");
assert type.getConstructors().size() == 1;
@@ -216,13 +216,13 @@
private void validateServletAnnotatedType(AnnotatedType<TestServlet> type) {
assert type.getBaseType().equals(TestServlet.class);
- assert typeSetMatches(type.getTypeClosure(), TestServlet.class, HttpServlet.class, GenericServlet.class, Servlet.class, ServletConfig.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), TestServlet.class, HttpServlet.class, GenericServlet.class, Servlet.class, ServletConfig.class, Object.class);
assert type.getAnnotations().isEmpty();
}
private void validateFilterAnnotatedType(AnnotatedType<TestFilter> type) {
assert type.getBaseType().equals(TestFilter.class);
- assert typeSetMatches(type.getTypeClosure(), TestFilter.class, Filter.class, Object.class);
+ assert rawTypeSetMatches(type.getTypeClosure(), TestFilter.class, Filter.class, Object.class);
assert type.getFields().size() == 2;
assert type.getConstructors().size() == 1;
assert type.getConstructors().iterator().next().getParameters().isEmpty();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -39,8 +39,7 @@
assert getBeans(CapercaillieLocal.class).size() == 1;
assert getBeans(ScottishBirdLocal.class).isEmpty();
Bean<CapercaillieLocal> bean = getUniqueBean(CapercaillieLocal.class);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(CapercaillieLocal.class);
+ assert rawTypeSetMatches(bean.getTypes(), CapercaillieLocal.class, Object.class);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -225,8 +225,7 @@
assert getBeans(Canary.class).size() == 1;
Bean<Canary> bean = getUniqueBean(Canary.class);
assert getBeans(Bird.class).isEmpty();
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(Canary.class);
+ assert typeSetMatches(bean.getTypes(), Canary.class, Object.class);
}
@Test
@@ -237,8 +236,7 @@
assert getBeans(Emu.class).isEmpty();
assert getBeans(EUROPEAN_FLIGHTLESS_BIRD).isEmpty();
Bean<FlightlessBird<Australian>> bean = getUniqueBean(AUSTRALIAN_FLIGHTLESS_BIRD);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(AUSTRALIAN_FLIGHTLESS_BIRD.getType());
+ assert typeSetMatches(bean.getTypes(), AUSTRALIAN_FLIGHTLESS_BIRD.getType(), Object.class);
}
@Test
@@ -248,8 +246,7 @@
assert getBeans(Parrot.class).size() == 1;
assert getBeans(Bird.class).isEmpty();
Bean<Parrot> bean = getUniqueBean(Parrot.class);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(Parrot.class);
+ assert typeSetMatches(bean.getTypes(), Parrot.class, Object.class);
}
@Test
@@ -259,8 +256,7 @@
assert getBeans(EUROPEAN_CAT, TAME).size() == 1;
assert getBeans(DomesticCat.class, TAME).isEmpty();
Bean<Cat<European>> bean = getUniqueBean(EUROPEAN_CAT, TAME);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(EUROPEAN_CAT.getType());
+ assert typeSetMatches(bean.getTypes(), EUROPEAN_CAT.getType(), Object.class);
}
@Test
@@ -270,18 +266,16 @@
assert getBeans(AFRICAN_CAT, WILD).size() == 1;
assert getBeans(Lion.class, WILD).isEmpty();
Bean<Cat<African>> bean = getUniqueBean(AFRICAN_CAT, WILD);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(AFRICAN_CAT.getType());
+ assert typeSetMatches(bean.getTypes(), AFRICAN_CAT.getType(), Object.class);
}
@Test
@SpecAssertion(section = "2.2.2", id = "d")
- public void testGeeBeanTypesOnProducerField()
+ public void testBeanTypesOnProducerField()
{
assert getBeans(Dove.class).size() == 1;
assert getBeans(Bird.class).isEmpty();
Bean<Dove> bean = getUniqueBean(Dove.class);
- assert bean.getTypes().size() == 1;
- assert bean.getTypes().iterator().next().equals(Dove.class);
+ assert typeSetMatches(bean.getTypes(), Dove.class, Object.class);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -79,7 +79,7 @@
{
Set<Bean<Result<? extends Throwable, ? super Exception>>> beans = getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){});
assert beans.size() == 1;
- assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
+ assert rawTypeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
@Test(groups = { "resolution" })
@@ -88,7 +88,7 @@
{
Set<Bean<Result<Exception, Exception>>> beans = getBeans(new TypeLiteral<Result<Exception, Exception>>(){});
assert beans.size() == 1;
- assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
+ assert rawTypeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
@Test(groups = { "resolution" })
@@ -97,7 +97,7 @@
{
Set<Bean<Result<T1, T2>>> beans = getBeans(new TypeLiteral<Result<T1, T2>>(){});
assert beans.size() == 1;
- assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
+ assert rawTypeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-08 00:05:24 UTC (rev 4763)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-11-08 00:24:46 UTC (rev 4764)
@@ -221,6 +221,7 @@
types.add(typeClosure.get(specifiedClass));
}
}
+ types.add(Object.class);
return types;
}
More information about the weld-commits
mailing list