[weld-commits] Weld SVN: r4783 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/resolution and 4 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Sun Nov 8 11:28:10 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-08 11:28:09 -0500 (Sun, 08 Nov 2009)
New Revision: 4783
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Animal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Bar.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Baz.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Corge.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator2.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl2.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Cow.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/DecoratorResolutionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FemaleFresianCow.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Foo.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooObjectDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FresianCow.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Garply.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Grault.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultExtendsDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultIntegerImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultSuperDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Qux.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxImpl.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListImpl.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/beans.xml
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/resources/tck-audit-cdi.xml
Log:
WELD-252
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Animal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Animal.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Animal.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class Animal
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Animal.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/decorators/resolution/Bar.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Bar.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Bar.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Bar<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Bar.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/decorators/resolution/BarDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class BarDecorator<T>
+{
+
+ @Inject @Delegate
+ private Bar<T> bar;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarDecorator.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/decorators/resolution/BarImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class BarImpl<T> implements Bar<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BarImpl.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/decorators/resolution/Baz.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Baz.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Baz.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Baz<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Baz.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/decorators/resolution/BazDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class BazDecorator
+{
+
+ @Inject @Delegate
+ private Baz<Object> baz;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazDecorator.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/decorators/resolution/BazImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class BazImpl<T> implements Baz<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/BazImpl.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/decorators/resolution/Corge.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Corge.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Corge.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Corge<T, S>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Corge.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/decorators/resolution/CorgeDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class CorgeDecorator
+{
+
+ @Inject @Delegate
+ private Corge<? extends Animal, ? super FresianCow> corge;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator.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/decorators/resolution/CorgeDecorator2.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator2.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator2.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class CorgeDecorator2
+{
+
+ @Inject @Delegate
+ private Corge<Animal, ? extends FemaleFresianCow> corge;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeDecorator2.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/decorators/resolution/CorgeImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class CorgeImpl implements Corge<Cow, Cow>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl.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/decorators/resolution/CorgeImpl2.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl2.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl2.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class CorgeImpl2 implements Corge<Animal, FemaleFresianCow>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/CorgeImpl2.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/decorators/resolution/Cow.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Cow.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Cow.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class Cow extends Animal
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Cow.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/decorators/resolution/DecoratorResolutionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/DecoratorResolutionTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/DecoratorResolutionTest.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, 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.jsr299.tck.tests.decorators.resolution;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+ at SpecVersion(spec="cdi", version="20091101")
+public class DecoratorResolutionTest<T, C extends Cow> extends AbstractJSR299Test
+{
+
+ private final TypeLiteral<Bar<T>> BAR_TYPE_VARIABLE_LITERAL = new TypeLiteral<Bar<T>>() {};
+ private final TypeLiteral<Baz<T>> BAZ_TYPE_VARIABLE_LITERAL = new TypeLiteral<Baz<T>>() {};
+ private final TypeLiteral<Foo<T>> FOO_TYPE_VARIABLE_LITERAL = new TypeLiteral<Foo<T>>() {};
+ private final TypeLiteral<Foo<Object>> FOO_OBJECT_LITERAL = new TypeLiteral<Foo<Object>>() {};
+ private final TypeLiteral<Qux<String>> QUX_STRING_LITERAL = new TypeLiteral<Qux<String>>() {};
+ private final TypeLiteral<Qux<List<String>>> QUX_STRING_LIST_LITERAL = new TypeLiteral<Qux<List<String>>>() {};
+ private final TypeLiteral<Grault<Integer>> GRAULT_INTEGER_LITERAL = new TypeLiteral<Grault<Integer>>() {};
+ private final TypeLiteral<Corge<C, C>> CORGE_TYPE_VARIABLE_EXTENDS_COW_LITERAL = new TypeLiteral<Corge<C, C>>(){};
+ private final TypeLiteral<Garply<? extends FresianCow>> GARPLY_EXTENDS_FRESIAN_COW_LITERAL = new TypeLiteral<Garply<? extends FresianCow>>() {};
+ private final TypeLiteral<Garply<Cow>> GARPLY_COW_LITERAL = new TypeLiteral<Garply<Cow>>() {};
+
+ private static boolean decoratorCollectionMatches(Collection<Decorator<?>> decorators, Class<?>... types)
+ {
+ Set<Class<?>> typeSet = new HashSet<Class<?>>(Arrays.asList(types));
+ for (Decorator<?> decorator : decorators)
+ {
+ typeSet.remove(decorator.getBeanClass());
+ }
+ return typeSet.isEmpty();
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="aa")
+ })
+
+ public void testUnboundedTypeVariables()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(BAR_TYPE_VARIABLE_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, BarDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="ab")
+ })
+
+ public void testObject()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(BAZ_TYPE_VARIABLE_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, BazDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="ac")
+ })
+
+ public void testUnboundedTypeVariablesAndObject()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(FOO_TYPE_VARIABLE_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, FooDecorator.class, FooObjectDecorator.class);
+ List<Decorator<?>> decorators1 = getCurrentManager().resolveDecorators(Collections.singleton(FOO_OBJECT_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators1, FooDecorator.class, FooObjectDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="c")
+ })
+
+ public void testIdenticalTypeParamerters()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(QUX_STRING_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, QuxDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="d")
+ })
+
+ public void testNestedIdenticalTypeParamerters()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(QUX_STRING_LIST_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, QuxListDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="e")
+ })
+ public void testDelegateWildcardBeanActualType()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(GRAULT_INTEGER_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, GraultExtendsDecorator.class, GraultSuperDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="f")
+ })
+ public void testDelegateWildcardBeanTypeVariable()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(CORGE_TYPE_VARIABLE_EXTENDS_COW_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, CorgeDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="g")
+ })
+ public void testDelegateTypeVariableBeanTypeVariable()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(GARPLY_EXTENDS_FRESIAN_COW_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, GarplyDecorator.class);
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "8.3.1", id="h")
+ })
+ public void testDelegateTypeVariableBeanActualType()
+ {
+ List<Decorator<?>> decorators = getCurrentManager().resolveDecorators(Collections.singleton(GARPLY_COW_LITERAL.getType()));
+ assert decoratorCollectionMatches(decorators, GarplyDecorator.class);
+ }
+
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/DecoratorResolutionTest.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/decorators/resolution/FemaleFresianCow.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FemaleFresianCow.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FemaleFresianCow.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class FemaleFresianCow extends FresianCow
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FemaleFresianCow.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/decorators/resolution/Foo.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Foo.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Foo.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Foo<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Foo.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/decorators/resolution/FooDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class FooDecorator<T>
+{
+
+ @Inject @Delegate
+ private Foo<T> foo;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooDecorator.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/decorators/resolution/FooImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class FooImpl<T> implements Foo<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooImpl.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/decorators/resolution/FooObjectDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooObjectDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooObjectDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class FooObjectDecorator
+{
+
+ @Inject @Delegate
+ private Foo<Object> foo;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FooObjectDecorator.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/decorators/resolution/FresianCow.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FresianCow.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FresianCow.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class FresianCow extends Cow
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/FresianCow.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/decorators/resolution/Garply.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Garply.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Garply.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Garply<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Garply.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/decorators/resolution/GarplyDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class GarplyDecorator<T extends Animal>
+{
+
+ @Inject @Delegate
+ private Garply<T> garply;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyDecorator.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/decorators/resolution/GarplyImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class GarplyImpl implements Garply<Cow>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GarplyImpl.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/decorators/resolution/Grault.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Grault.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Grault.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Grault<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Grault.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/decorators/resolution/GraultExtendsDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultExtendsDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultExtendsDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class GraultExtendsDecorator
+{
+
+ @Inject @Delegate
+ private Grault<? extends Number> grault;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultExtendsDecorator.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/decorators/resolution/GraultIntegerImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultIntegerImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultIntegerImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class GraultIntegerImpl implements Grault<Integer>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultIntegerImpl.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/decorators/resolution/GraultSuperDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultSuperDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultSuperDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class GraultSuperDecorator
+{
+
+ @Inject @Delegate
+ private Grault<? super Integer> grault;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/GraultSuperDecorator.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/decorators/resolution/Qux.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Qux.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Qux.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public interface Qux<T>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/Qux.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/decorators/resolution/QuxDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class QuxDecorator
+{
+
+ @Inject @Delegate
+ private Qux<String> qux;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxDecorator.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/decorators/resolution/QuxImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+public class QuxImpl implements Qux<String>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxImpl.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/decorators/resolution/QuxListDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListDecorator.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import java.util.List;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+ at Decorator
+public class QuxListDecorator
+{
+
+ @Inject @Delegate
+ private Qux<List<String>> qux;
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListDecorator.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/decorators/resolution/QuxListImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListImpl.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.decorators.resolution;
+
+import java.util.List;
+
+public class QuxListImpl implements Qux<List<String>>
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/resolution/QuxListImpl.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/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 16:16:39 UTC (rev 4782)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-11-08 16:28:09 UTC (rev 4783)
@@ -81,6 +81,15 @@
assert beans.size() == 1;
assert rawTypeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
+
+ @Test(groups = { "resolution" })
+ @SpecAssertion(section = "5.2.3", id = "db")
+ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards2()
+ {
+ Set<Bean<Result<? extends Exception, ? super Exception>>> beans = getBeans(new TypeLiteral<Result<? extends Exception, ? super Exception>>(){});
+ assert beans.size() == 1;
+ assert rawTypeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
+ }
@Test(groups = { "resolution" })
@SpecAssertion(section = "5.2.3", id = "e")
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/beans.xml 2009-11-08 16:28:09 UTC (rev 4783)
@@ -0,0 +1,15 @@
+<beans>
+ <decorators>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.BarDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.FooDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.FooObjectDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.QuxDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.QuxListDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.BazDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.GraultExtendsDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.GraultSuperDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.CorgeDecorator2</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.CorgeDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.GarplyDecorator</class>
+ </decorators>
+</beans>
Property changes on: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/resolution/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 16:16:39 UTC (rev 4782)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 16:28:09 UTC (rev 4783)
@@ -4382,17 +4382,21 @@
</assertion>
</section>
- <section id="8.3.1">
+ <section id="8.3.1" title="Assignability of raw and parameterized types for delegate injection points">
<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="a">
+ <assertion id="ab">
<text>Check all type parameters are unbounded type variables</text>
</assertion>
- <assertion id="b">
+ <assertion id="ab">
<text>Check all type parameters are Object</text>
</assertion>
+
+ <assertion id="ac">
+ <text>Check mix</text>
+ </assertion>
</group>
<group>
More information about the weld-commits
mailing list