Author: petemuir Date: 2010-10-30 13:02:35 -0400 (Sat, 30 Oct 2010) New Revision: 7049 Removed: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalDecorator.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/beans.xml Log: CDITCK-138 Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalDecorator.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalDecorator.java 2010-10-30 16:57:59 UTC (rev 7048) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalDecorator.java 2010-10-30 17:02:35 UTC (rev 7049) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., 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.lookup.injectionpoint; - -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; - -@Decorator -class AnimalDecorator implements Animal { - - @Inject @Delegate - private Animal bean; - - public String hello() { - return bean.hello() + " world!"; - } -} Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java 2010-10-30 16:57:59 UTC (rev 7048) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cat.java 2010-10-30 17:02:35 UTC (rev 7049) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., 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.lookup.injectionpoint; - -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; - -class Cat implements Animal -{ - @Inject private InjectionPoint injectionPoint; - - @Inject private BeanManager beanManager; - - public String hello() { - return "hello"; - } - - public InjectionPoint getInjectionPoint() { - return injectionPoint; - } - - public BeanManager getBeanManager() - { - return beanManager; - } -} Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-10-30 16:57:59 UTC (rev 7048) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2010-10-30 17:02:35 UTC (rev 7049) @@ -217,17 +217,4 @@ assert !ip1.isTransient(); assert ip2.isTransient(); } - - @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.5.7", id="dba") - public void testIsDelegate() - { - assert !getInstanceByType(FieldInjectionPointBean.class).getInjectedBean().getInjectedMetadata().isDelegate(); - - Cat cat = getInstanceByType(Cattery.class).getCat(); - assert cat.hello().equals("hello world!"); - assert cat.getBeanManager() != null; - assert cat.getInjectionPoint() != null; - assert cat.getInjectionPoint().isDelegate(); - } } Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/beans.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/beans.xml 2010-10-30 16:57:59 UTC (rev 7048) +++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injectionpoint/beans.xml 2010-10-30 17:02:35 UTC (rev 7049) @@ -1,6 +1,5 @@ <beans> <decorators> <class>org.jboss.jsr299.tck.tests.lookup.injectionpoint.TimestampLogger</class> - <class>org.jboss.jsr299.tck.tests.lookup.injectionpoint.AnimalDecorator</class> </decorators> </beans>