Author: shane.bryzak(a)jboss.com Date: 2009-07-21 02:33:40 -0400 (Tue, 21 Jul 2009) New Revision: 3101 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java Log: fix producer field definition tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java 2009-07-21 04:22:46 UTC (rev 3100) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/DefangedTarantula.java 2009-07-21 06:33:40 UTC (rev 3101) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.definition; - class DefangedTarantula extends Tarantula { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-21 04:22:46 UTC (rev 3100) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-21 06:33:40 UTC (rev 3101) @@ -29,14 +29,6 @@ private static final Annotation FOO_LITERAL = new AnnotationLiteral<Foo>() {}; private static final Annotation STATIC_LITERAL = new AnnotationLiteral<Static>() {}; - @Test(groups = { "producerField", "deployment" }) - @SpecAssertion(section = "review", id = "review") - public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception - { - Set<Bean<Tarantula>> tarantulaBeans = getBeans(Tarantula.class); - assert tarantulaBeans.size() == 1; - } - @Test(groups = "producerField") @SpecAssertion(section = "3.4", id = "fa") public void testParameterizedReturnType() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-21 04:22:46 UTC (rev 3100) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java 2009-07-21 06:33:40 UTC (rev 3101) @@ -6,6 +6,6 @@ class TameTarantulaProducer { - @Produces @Foo @Tame @RequestScoped @Production public Tarantula produceTarantula = new DefangedTarantula(); + @Produces @Foo @Tame @RequestScoped public Tarantula produceTarantula = new DefangedTarantula(); } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java 2009-07-21 04:22:46 UTC (rev 3100) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/TarantulaConsumer.java 2009-07-21 06:33:40 UTC (rev 3101) @@ -1,39 +0,0 @@ -/* - * 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.implementation.producer.field.definition; - -import javax.enterprise.inject.Current; - -/** - * This bean contains an injection point for a Tarantula that must be provided - * by the container via a (static) producer field. - * - * @author David Allen - * - */ -class TarantulaConsumer -{ - @Current - private Tarantula consumedTarantula; - - public Tarantula getConsumedTarantula() - { - return consumedTarantula; - } - -}