Author: scabanovich Date: 2010-09-13 10:32:08 -0400 (Mon, 13 Sep 2010) New Revision: 24895 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java Log: https://jira.jboss.org/browse/JBIDE-6957 Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java 2010-09-13 13:26:51 UTC (rev 24894) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; - -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; - -@Decorator -public abstract class TimestampLoggerBroken extends Clazz<Logger> implements Logger { - - @Inject @Delegate private Clazz<String> logger; - -} \ No newline at end of file Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +@Decorator +public abstract class TimestampLoggerOk extends Clazz<Logger> implements Logger { + + @Inject @Delegate private Clazz<String> logger; + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java 2010-09-13 13:26:51 UTC (rev 24894) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; - -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; - -@Decorator -public abstract class TimestampLoggerWithMethodBroken extends Clazz<String> implements Logger { - - @Inject void setInt(@Delegate Clazz<Logger> logger) { - } -} \ No newline at end of file Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +@Decorator +public abstract class TimestampLoggerWithMethodOk extends Clazz<String> implements Logger { + + @Inject void setInt(@Delegate Clazz<Logger> logger) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java 2010-09-13 13:26:51 UTC (rev 24894) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; - -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; - -@Decorator -public abstract class TimestampParametedLoggerBroken extends Clazz<String> { - - @Inject @Delegate private Clazz<Logger> logger; - -} \ No newline at end of file Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +@Decorator +public abstract class TimestampParametedLoggerOk extends Clazz<String> { + + @Inject @Delegate private Clazz<Logger> logger; + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java 2010-09-13 13:26:51 UTC (rev 24894) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; - -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; - -@Decorator -public abstract class TimestampParametedLoggerWithMethodBroken extends Clazz<Logger> { - - @Inject void setInt(@Delegate Clazz<String> logger) { - } -} \ No newline at end of file Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java (from rev 24894, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +@Decorator +public abstract class TimestampParametedLoggerWithMethodOk extends Clazz<Logger> { + + @Inject void setInt(@Delegate Clazz<String> logger) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-13 13:26:51 UTC (rev 24894) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-13 14:32:08 UTC (rev 24895) @@ -1084,33 +1084,42 @@ * 8.1.3. Decorator delegate injection points * - delegate type specifies different type parameters * + * However, if type parameter does not affect decorated types + * (that is implemented interfaces), there is no error. + * * @throws Exception */ public void testDelegateSpecifiesDifferentTypeParameterWithInterfaceInFiled() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerBroken.java"); - assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerOk.java"); + assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10); } /** * 8.1.3. Decorator delegate injection points * - delegate type specifies different type parameters * + * However, if type parameter does not affect decorated types + * (that is implemented interfaces), there is no error. + * * @throws Exception */ public void testDelegateSpecifiesDifferentTypeParameterWithInterfaceInMethod() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodBroken.java"); - assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampLoggerWithMethodOk.java"); + assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10); } /** * 8.1.3. Decorator delegate injection points * - delegate type specifies different type parameters * + * However, if type parameter does not affect decorated types + * (that is implemented interfaces), there is no error. + * * @throws Exception */ public void testDelegateSpecifiesDifferentTypeParameterInFiled() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerBroken.java"); - assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerOk.java"); + assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<java.lang.String>"), 10); file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLogger.java"); assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Logger")); @@ -1123,11 +1132,13 @@ * 8.1.3. Decorator delegate injection points * - delegate type specifies different type parameters * + * However, if type parameter does not affect decorated types + * (that is implemented interfaces), there is no error. * @throws Exception */ public void testDelegateSpecifiesDifferentTypeParameterInMethod() throws Exception { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodBroken.java"); - assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethodOk.java"); + assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Clazz<org.jboss.jsr299.tck.tests.jbt.validation.decorators.delegates.Logger>"), 10); file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/delegates/TimestampParametedLoggerWithMethod.java"); assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DELEGATE_HAS_ILLEGAL_TYPE, "Logger"));