Author: akazakov Date: 2011-07-20 18:48:45 -0400 (Wed, 20 Jul 2011) New Revision: 33084 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AdvancedPaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AlternativePaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AsynchronousPaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NonBinding.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayBy.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayByBinding.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentInterceptor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessorImpl.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/RemotePaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SimplePaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SynchronousPaymentProcessor.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DynamicLookupTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java Log: https://issues.jboss.org/browse/JBIDE-9329 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AdvancedPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AdvancedPaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AdvancedPaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,38 @@ +/* + * 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.jbt.lookup; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jsr299.tck.tests.jbt.lookup.PayBy.PaymentMethod; + +(a)PayBy(PaymentMethod.CHEQUE) +@ApplicationScoped +class AdvancedPaymentProcessor implements AsynchronousPaymentProcessor +{ + private int value = 0; + + public int getValue() + { + return value; + } + + public void setValue(int value) + { + this.value = value; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AdvancedPaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AlternativePaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AlternativePaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AlternativePaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.lookup; + +import javax.enterprise.inject.Alternative; + +@Alternative +public class AlternativePaymentProcessor extends PaymentProcessorImpl { + + public AlternativePaymentProcessor() { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AlternativePaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AsynchronousPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AsynchronousPaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AsynchronousPaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,23 @@ +/* + * 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.jbt.lookup; + +interface AsynchronousPaymentProcessor extends PaymentProcessor +{ + int getValue(); + void setValue(int value); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/AsynchronousPaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NonBinding.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NonBinding.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NonBinding.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,35 @@ +/* + * 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.jbt.lookup; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@interface NonBinding +{ + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NonBinding.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,41 @@ +/* + * 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.jbt.lookup; + +import static org.jboss.jsr299.tck.tests.jbt.lookup.PayBy.PaymentMethod.CHEQUE; + +import javax.enterprise.inject.Any; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + +class ObtainsInstanceBean { + @Inject @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor; + + @Inject @Any Instance<PaymentProcessor> anyPaymentProcessor; + + @Inject @Any PaymentProcessor anyPaymentProcessorBroken; + + @Inject PaymentProcessor defaultPaymentProcessor; + + public Instance<AsynchronousPaymentProcessor> getPaymentProcessor() { + return paymentProcessor; + } + + public Instance<PaymentProcessor> getAnyPaymentProcessor() { + return anyPaymentProcessor; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayBy.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayBy.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayBy.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,40 @@ +/* + * 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.jbt.lookup; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +@interface PayBy +{ + public static enum PaymentMethod { CASH, CHEQUE, CREDIT_CARD }; + + PaymentMethod value(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayBy.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayByBinding.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayByBinding.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayByBinding.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,24 @@ +/* + * 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.jbt.lookup; + +import javax.enterprise.util.AnnotationLiteral; + +abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy +{ + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PayByBinding.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentInterceptor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentInterceptor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentInterceptor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.jbt.lookup; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +@Interceptor +public class PaymentInterceptor implements PaymentProcessor { + + public PaymentInterceptor() { + } + + @AroundInvoke + public Object manage(InvocationContext ic) throws Exception { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentInterceptor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,21 @@ +/* + * 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.jbt.lookup; + +interface PaymentProcessor +{ +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessorImpl.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessorImpl.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessorImpl.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.tests.jbt.lookup; + +public class PaymentProcessorImpl implements PaymentProcessor { + + public PaymentProcessorImpl() { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/PaymentProcessorImpl.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/RemotePaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/RemotePaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/RemotePaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,38 @@ +/* + * 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.jbt.lookup; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jsr299.tck.tests.jbt.lookup.PayBy.PaymentMethod; + +@ApplicationScoped +(a)PayBy(PaymentMethod.CREDIT_CARD) +class RemotePaymentProcessor implements AsynchronousPaymentProcessor +{ + private int value = 0; + + public int getValue() + { + return value; + } + + public void setValue(int value) + { + this.value = value; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/RemotePaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SimplePaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SimplePaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SimplePaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,29 @@ +/* + * 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.jbt.lookup; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Alternative; + +import org.jboss.jsr299.tck.tests.jbt.lookup.PayBy.PaymentMethod; + +(a)PayBy(PaymentMethod.CASH) +@ApplicationScoped +@Alternative +class SimplePaymentProcessor extends PaymentProcessorImpl implements SynchronousPaymentProcessor +{ +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SimplePaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SynchronousPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SynchronousPaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SynchronousPaymentProcessor.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -0,0 +1,21 @@ +/* + * 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.jbt.lookup; + +interface SynchronousPaymentProcessor extends PaymentProcessor +{ +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/SynchronousPaymentProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-20 20:15:07 UTC (rev 33083) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -25,7 +25,6 @@ import org.jboss.tools.cdi.core.test.tck.BuiltInBeanInjectionTest; import org.jboss.tools.cdi.core.test.tck.DecoratorDefinitionTest; import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest; -import org.jboss.tools.cdi.core.test.tck.DynamicLookupTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseResolutionByTypeTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest; @@ -43,6 +42,7 @@ import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest; import org.jboss.tools.cdi.core.test.tck.lookup.AmbiguousDependencyTest; import org.jboss.tools.cdi.core.test.tck.lookup.CircularDependencyTest; +import org.jboss.tools.cdi.core.test.tck.lookup.DynamicLookupTest; import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByNameTest; import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByTypeTest; import org.jboss.tools.cdi.core.test.tck.lookup.UnsatisfiedDependencyTest; @@ -88,7 +88,6 @@ suite.addTestSuite(EnterpriseResolutionByTypeTest.class); suite.addTestSuite(AssignabilityOfRawAndParameterizedTypesTest.class); suite.addTestSuite(QualifierWithMembersTest.class); - suite.addTestSuite(DynamicLookupTest.class); suite.addTestSuite(InterceptorDefinitionTest.class); suite.addTestSuite(DecoratorDefinitionTest.class); suite.addTestSuite(ObserverMethodResolutionTest.class); Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DynamicLookupTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DynamicLookupTest.java 2011-07-20 20:15:07 UTC (rev 33083) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DynamicLookupTest.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core.test.tck; - -import java.util.Set; - -import org.eclipse.core.runtime.CoreException; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.IInjectionPointField; - -/** - * @author Alexey Kazakov - */ -public class DynamicLookupTest extends TCKTest { - - /** - * Section 5.6 - Programmatic lookup - * @throws CoreException - */ - public void testObtainsInjectsInstance() throws CoreException { - IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor"); - Set<IBean> beans = cdiProject.getBeans(true, injection); - assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor"); - } - - /** - * Section 5.6 - Programmatic lookup - * @throws CoreException - */ - public void testObtainsAmbiguousInjectsInstance() throws CoreException { - IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "anyPaymentProcessor"); - Set<IBean> beans = cdiProject.getBeans(true, injection); - assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.SimplePaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.RemotePaymentProcessor"); - } -} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2011-07-20 20:15:07 UTC (rev 33083) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2011-07-20 22:48:45 UTC (rev 33084) @@ -23,16 +23,24 @@ public class DynamicLookupTest extends TCKTest { /** - * section 5.6 aa) - * @throws CoreException + * Section 5.6 - Programmatic lookup + * @throws CoreException */ - public void testObtainsInjectsInstanceOfInstance() throws CoreException { - IInjectionPointField injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor"); - Set<IBean> beans = cdiProject.getBeans(false, injectionPoint); + public void testObtainsInjectsInstance() throws CoreException { + IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor"); + Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals(1, beans.size()); + assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor"); + } - injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "anyPaymentProcessor"); - beans = cdiProject.getBeans(false, injectionPoint); + /** + * Section 5.6 - Programmatic lookup + * @throws CoreException + */ + public void testObtainsAmbiguousInjectsInstance() throws CoreException { + IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "anyPaymentProcessor"); + Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals(3, beans.size()); + assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.SimplePaymentProcessor", "org.jboss.jsr299.tck.tests.lookup.dynamic.RemotePaymentProcessor"); } } \ No newline at end of file