Author: marius.bogoevici Date: 2010-04-12 21:58:16 -0400 (Mon, 12 Apr 2010) New Revision: 6097 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml Log: Tests for WELD-488 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/Decorated.java 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.weld.tests.decorators.generic.extend; + +/** + * @author Marius Bogoevici + */ +public interface Decorated<T> +{ + T decoratedEcho(T parameter); +} \ No newline at end of file Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java (from rev 6094, core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java) =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.weld.tests.decorators.generic.extend; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.weld.test.AbstractWeldTest; + +import org.testng.annotations.Test; + +/** + * @author Marius Bogoevici + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class ExtendDecoratorTest extends AbstractWeldTest +{ + + @Test(groups = "broken") + public void testExtendedDecoratorDeploys() + { + } +} \ No newline at end of file Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecorated.java 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,25 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.weld.tests.decorators.generic.extend; + +/** + * @author Marius Bogoevici + */ +public interface ExtendsDecorated extends Decorated<String> +{ +} Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedDecorator.java 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.weld.tests.decorators.generic.extend; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +/** + * @author Marius Bogoevici + */ +@Decorator +public class ExtendsDecoratedDecorator implements ExtendsDecorated +{ + @Inject @Delegate ExtendsDecorated delegate; + + public String decoratedEcho(String parameter) + { + return "decorated-" + parameter + "-decorated"; + } +} Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendsDecoratedImpl.java 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.weld.tests.decorators.generic.extend; + +/** + * @author Marius Bogoevici + */ +public class ExtendsDecoratedImpl implements ExtendsDecorated +{ + public String decoratedEcho(String parameter) + { + return parameter; + } +} Copied: core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml (from rev 6094, core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml) =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml (rev 0) +++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/extend/beans.xml 2010-04-13 01:58:16 UTC (rev 6097) @@ -0,0 +1,5 @@ +<beans> + <decorators> + <decorator>org.jboss.weld.tests.decorators.generic.extend.ExtendsDecoratedDecorator</decorator> + </decorators> +</beans> \ No newline at end of file