[weld-commits] Weld SVN: r5762 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator and 34 other directories.

Friday, 5 February 2010

Author: jharting
Date: 2010-02-05 09:57:59 -0500 (Fri, 05 Feb 2010)
New Revision: 5762

Added:
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Bar.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Bus.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/BusFactory.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/MultipleDisposerMethodsForProducerMethodTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Scrapyard.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Vehicle.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Bar.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Bar.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Bar.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/FooDecorator_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/Secure.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/GeneralListProducer.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderListProducer.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleExtension.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Submarine.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Carp.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/FishingNet.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Bar.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/beans.xml
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/beans.xml
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/beans.xml
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/beans.xml
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/beans.xml
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/
  
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/beans.xml
Removed:
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/ParameterizedTypeWithTypeParameterTest.java
Modified:
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
  
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
   cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
Tests for Chapter 3.

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Bar.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Bar.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Bar.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,34 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.decorator;
+
+import javax.enterprise.inject.Produces;
+
+public class Bar implements Foo
+{
+
+   public boolean foo()
+   {
+      return false;
+   }
+   
+   @Produces
+   public Integer produce()
+   {
+      return 0;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.decorator;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class DisposerMethodOnDecoratorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.3.2", id = "gb")
+   //WELD-424
+   public void testDisposerMethodNotAllowedOnDecorator()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.disposal.method.definition.broken.decorator;
+
+public interface Foo
+{
+   boolean foo();
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.disposal.method.definition.broken.decorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Disposes;
+import javax.inject.Inject;
+
+@Decorator
+public class FooDecorator_Broken implements Foo
+{
+   @Inject @Delegate
+   private Foo delegate;
+   
+   public boolean foo()
+   {
+      return !delegate.foo();
+   }
+
+   public void dispose(@Disposes Integer zero)
+   {
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.interceptor;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class DisposerMethodOnInterceptorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.3.6", id = "ga")
+   //WELD-424
+   public void testDisposerMethodNotAllowedOnInterceptor()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,28 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.interceptor;
+
+import javax.enterprise.inject.Produces;
+
+public class FooProducer
+{
+   @Produces
+   public String produce()
+   {
+      return "foo";
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,36 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.interceptor;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface Secure
+{
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,37 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.interceptor;
+
+import javax.enterprise.inject.Disposes;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Secure
+public class SimpleInterceptor_Broken
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      return ctx.proceed();
+   }
+   
+   public void dispose(@Disposes String foo)
+   {
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Bus.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Bus.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Bus.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,28 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.multipleDisposersForProducer;
+
+public class Bus
+{
+   @SuppressWarnings("unused")
+   private String name;
+   
+   public Bus(String name)
+   {
+      this.name = name;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/BusFactory.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/BusFactory.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/BusFactory.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,33 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.multipleDisposersForProducer;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+public class BusFactory
+{
+   @Produces
+   public Bus producesBus()
+   {
+      return new Bus("School bus");
+   }
+   
+   public void disposeBus(@Disposes Bus bus)
+   {
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/MultipleDisposerMethodsForProducerMethodTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/MultipleDisposerMethodsForProducerMethodTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/MultipleDisposerMethodsForProducerMethodTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,39 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.multipleDisposersForProducer;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class MultipleDisposerMethodsForProducerMethodTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.3.7", id = "ba")
+   public void testMultipleDisposerMethodsForProducerMethodNotAllowed()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Scrapyard.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Scrapyard.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Scrapyard.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,26 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.multipleDisposersForProducer;
+
+import javax.enterprise.inject.Disposes;
+
+public class Scrapyard
+{
+   public void disposeBus(@Disposes Vehicle bus)
+   {
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Vehicle.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Vehicle.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multipleDisposersForProducer/Vehicle.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,22 @@
+/*
+ * 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.implementation.disposal.method.definition.broken.multipleDisposersForProducer;
+
+public interface Vehicle
+{
+
+}

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -53,7 +53,10 @@
    
    
    @Test(groups = { "new", "jboss-as-broken" })
-   @SpecAssertion(section = "3.7.1", id = "ab")
+   @SpecAssertions({
+      @SpecAssertion(section = "3.7.1", id = "ab"),
+      @SpecAssertion(section = "5.5.1", id = "ab")
+   })
    // WELD-357
    public void testConstructorAnnotatedInjectCalled()
    {

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Bar.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Bar.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Bar.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,31 @@
+/*
+ * 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.implementation.initializer.broken.generic;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.inject.Produces;
+
+public class Bar
+{
+   @Produces
+   public List<Integer> produceInts()
+   {
+      return Collections.emptyList();
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,37 @@
+/*
+ * 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.implementation.initializer.broken.generic;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class Foo
+{
+   private List<?> injectedList;
+   
+   @Inject
+   public <T> void init(List<T> list)
+   {
+      injectedList = list;
+   }
+
+   public List<?> getInjectedList()
+   {
+      return injectedList;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.initializer.broken.generic;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class GenericInitializerMethodTest extends AbstractJSR299Test
+{
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "3.9.1", id = "ab")
+   //WELD-425
+   public void testGenericInitializerMethodNotAllowed()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Bar.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Bar.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Bar.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,27 @@
+/*
+ * 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.implementation.producer.field.definition.broken.decorator;
+
+public class Bar implements Foo
+{
+
+   public boolean foo()
+   {
+      return false;
+   }
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.producer.field.definition.broken.decorator;
+
+public interface Foo
+{
+   boolean foo();
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.producer.field.definition.broken.decorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+@Decorator
+public class FooDecorator_Broken implements Foo
+{
+   @Inject @Delegate
+   private Foo delegate;
+   
+   public boolean foo()
+   {
+      return !delegate.foo();
+   }
+
+   @SuppressWarnings("unused")
+   @Produces
+   private Integer zero = 0;
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.producer.field.definition.broken.decorator;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class ProducerFieldOnDecoratorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.4.2", id = "ib")
+   //WELD-419
+   public void testProducerFieldNotAllowedOnDecorator()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,28 @@
+/*
+ * 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.implementation.producer.field.definition.broken.inject;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+public class FooProducer
+{
+   @SuppressWarnings("unused")
+   @Produces
+   @Inject
+   private String foo = "foo";
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,44 @@
+/*
+ * 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.implementation.producer.field.definition.broken.inject;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class InjectAnnotatedProducerFieldTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertions({
+      @SpecAssertion(section = "3.4.2", id = "g"),
+      @SpecAssertion(section = "3.8.1", id = "b")
+   })
+   //WELD-421
+   public void testInjectAnnotatedProducerFieldNotAllowed()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.producer.field.definition.broken.interceptor;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class ProducerFieldOnInterceptorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.4.2", id = "ia")
+   //WELD-419
+   public void testProducerFieldNotAllowedOnInterceptor()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,36 @@
+/*
+ * 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.implementation.producer.field.definition.broken.interceptor;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface Secure
+{
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,37 @@
+/*
+ * 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.implementation.producer.field.definition.broken.interceptor;
+
+import javax.enterprise.inject.Produces;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Secure
+public class SimpleInterceptor_Broken
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      return ctx.proceed();
+   }
+   
+   @SuppressWarnings("unused")
+   @Produces
+   private Integer zero = 0;
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Bar.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Bar.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Bar.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,27 @@
+/*
+ * 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.implementation.producer.method.broken.decorator;
+
+public class Bar implements Foo
+{
+
+   public boolean foo()
+   {
+      return false;
+   }
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.producer.method.broken.decorator;
+
+public interface Foo
+{
+   boolean foo();
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/FooDecorator_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/FooDecorator_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/FooDecorator_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -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.implementation.producer.method.broken.decorator;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+@Decorator
+public class FooDecorator_Broken implements Foo
+{
+   @Inject @Delegate
+   private Foo delegate;
+   
+   public boolean foo()
+   {
+      return !delegate.foo();
+   }
+
+   @Produces
+   public Integer getInt()
+   {
+      return 0;
+   }
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.producer.method.broken.decorator;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class ProducerMethodOnDecoratorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.3.2", id = "gb")
+   //WELD-419
+   public void testProducerMethodNotAllowedOnDecorator()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.producer.method.broken.interceptor;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml(&quot;beans.xml&quot;)
+public class ProducerMethodOnInterceptorTest extends AbstractJSR299Test
+{
+   @Test
+   @SpecAssertion(section = "3.3.2", id = "ga")
+   //WELD-419
+   public void testProducerMethodNotAllowedOnInterceptor()
+   {
+      assert false;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/Secure.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/Secure.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/Secure.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,36 @@
+/*
+ * 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.implementation.producer.method.broken.interceptor;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.interceptor.InterceptorBinding;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+@interface Secure
+{
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,39 @@
+/*
+ * 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.implementation.producer.method.broken.interceptor;
+
+import javax.enterprise.inject.Produces;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Secure
+public class SimpleInterceptor_Broken
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      return ctx.proceed();
+   }
+   
+   @Produces
+   public Integer foo()
+   {
+      return 0;
+   }
+}

Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType
(from rev 5715,
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2)

Deleted:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/ParameterizedTypeWithTypeParameterTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java	2010-02-02
16:57:49 UTC (rev 5715)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/ParameterizedTypeWithTypeParameterTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -1,44 +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.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2;
-
-
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentFailure;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DeploymentFailure.class)
-@SpecVersion(spec="cdi", version="20091101")
-public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
-{   
-   @Test
-   @SpecAssertions({
-      @SpecAssertion(section = "3.3", id = "ib"),
-      @SpecAssertion(section = "2.2.1", id="la")
-   })
-   public void testParameterizedType()
-   {
-      assert false;
-   }
-
-}

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/TProducer.java	2010-02-02
16:57:49 UTC (rev 5715)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package
org.jboss.jsr299.tck.tests.implementation.producer.method.broken.parameterizedTypeWithTypeParameter2;
+package
org.jboss.jsr299.tck.tests.implementation.producer.method.broken.typeVariableReturnType;
 
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;

Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java
(from rev 5715,
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java)
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,44 @@
+/*
+ * 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.implementation.producer.method.broken.typeVariableReturnType;
+
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class TypeVariableReturnTypeTest extends AbstractJSR299Test
+{   
+   @Test
+   @SpecAssertions({
+      @SpecAssertion(section = "3.3", id = "ib"),
+      @SpecAssertion(section = "2.2.1", id="la")
+   })
+   public void testTypeVariableNotAllowed()
+   {
+      assert false;
+   }
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/GeneralListProducer.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/GeneralListProducer.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/GeneralListProducer.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,37 @@
+/*
+ * 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.implementation.producer.method.definition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.inject.Produces;
+
+public class GeneralListProducer<T>
+{
+   public GeneralListProducer(String name)
+   {
+      
+   }
+   
+   @Produces
+   public List<T> create()
+   {
+       return new ArrayList<T>();
+   } 
+}
+

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -17,6 +17,7 @@
 package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
 
 import java.lang.annotation.Annotation;
+import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.spi.CreationalContext;
@@ -271,4 +272,13 @@
       getInstanceByType(Pollen.class, new AnnotationLiteral<Yummy>() {}).ping();
       assert false;
    }
+   
+   @Test
+   @SpecAssertion(section = "3.3", id = "iaa")
+   //WELD-426
+   public void testTypeVariableReturnType()
+   {
+      // should be created by SpiderListProducer
+      assert getBeans(new TypeLiteral<List<Spider>>(){}).size() == 1;
+   }
 }

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderListProducer.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderListProducer.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderListProducer.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,26 @@
+/*
+ * 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.implementation.producer.method.definition;
+
+public class SpiderListProducer extends GeneralListProducer<Spider>
+{
+   public SpiderListProducer()
+   {
+      super(null);
+   }
+}
+

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -61,6 +61,13 @@
    {
       assert getBeans(Car.class).size() == 0;
    }
+   
+   @Test
+   @SpecAssertion(section = "3.1.1", id = "g")
+   public void testExtensionNotDiscoveredAsSimpleBean()
+   {
+      assert getBeans(SimpleExtension.class).size() == 0;
+   }
 
    @Test
    @SpecAssertion(section="3.1.1", id="p")
@@ -91,7 +98,8 @@
    @SpecAssertions({
       @SpecAssertion(section = "3.7.1", id = "ba"),
       @SpecAssertion(section = "3.1.3", id = "a"),
-      @SpecAssertion(section = "3.7", id = "a")
+      @SpecAssertion(section = "3.7", id = "a"),
+      @SpecAssertion(section = "5.5.1", id = "ba")
    })
    public void testEmptyConstructorUsed()
    {
@@ -101,7 +109,10 @@
    }
 
    @Test
-   @SpecAssertion(section = "3.7.1", id = "aa")
+   @SpecAssertions({
+      @SpecAssertion(section = "3.7.1", id = "aa"),
+      @SpecAssertion(section = "5.5.1", id = "aa")
+   })
    public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws
Exception
    {
       getInstanceByType(Turkey.class);

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleExtension.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleExtension.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleExtension.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,25 @@
+/*
+ * 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.implementation.simple.definition;
+
+import javax.enterprise.inject.spi.Extension;
+
+public class SimpleExtension implements Extension
+{
+
+}

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -179,8 +179,7 @@
       @SpecAssertion(section = "7.3.1", id = "aa"),
       @SpecAssertion(section = "3.8.1", id = "aa"),
       @SpecAssertion(section="2.3.4", id="a"),
-      @SpecAssertion(section="3.8", id="aa"),
-      @SpecAssertion(section="3.8", id="ab"),
+      @SpecAssertion(section="3.8", id="a"),
       @SpecAssertion(section="12.1", id="bca")
    })
    public void testCreateInjectsFieldsDeclaredInJava()

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -298,6 +298,21 @@
       assert AtomicInterceptor.intercepted;
       assert MissileInterceptor.intercepted;
    }
+   
+   @Test
+   @SpecAssertion(section = "3.9", id = "f")
+   public void testInitializerMethodNotIntercepter()
+   {
+      MissileInterceptor.intercepted = false;
+      
+      Submarine submarine = getInstanceByType(Submarine.class);
+      
+      assert !MissileInterceptor.intercepted;
+      
+      assert submarine.isInjected(); // this call is intercepted
+      
+      assert MissileInterceptor.intercepted;
+   }
 
    private Interceptor<?> getTransactionalInterceptor()
    {

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Submarine.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Submarine.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Submarine.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,36 @@
+/*
+ * 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.interceptors.definition;
+
+import javax.inject.Inject;
+
+@MissileBinding
+public class Submarine
+{
+   private Warhead warhead;
+   
+   @Inject
+   public void init(Warhead warhead)
+   {
+      this.warhead = warhead;
+   }
+   
+   public boolean isInjected()
+   {
+      return warhead != null;
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Carp.java
===================================================================

--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Carp.java	  
                     (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/Carp.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,25 @@
+/*
+ * 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.byname;
+
+import javax.inject.Named;
+
+@Named
+public class Carp implements Animal
+{
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/FishingNet.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/FishingNet.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/FishingNet.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,31 @@
+/*
+ * 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.byname;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class FishingNet
+{
+   @Inject @Named
+   private Animal carp;
+   
+   public boolean isCarpInjected()
+   {
+      return (carp != null) && (carp instanceof Carp);
+   }
+}

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -51,4 +51,11 @@
       assert beans.size() == 2;
       assert getCurrentManager().resolve(beans).getTypes().contains(Sole.class);
    }
+   
+   @Test
+   @SpecAssertion(section = "3.11", id = "a")
+   public void testFieldNameUsedAsBeanName()
+   {
+      assert getInstanceByType(FishingNet.class).isCarpInjected();
+   }
 }

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Bar.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Bar.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Bar.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,25 @@
+/*
+ * 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.byname.broken.injectionPointWithNamed;
+
+import javax.inject.Named;
+
+@Named
+public class Bar
+{
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,33 @@
+/*
+ * 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.byname.broken.injectionPointWithNamed;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class Foo
+{
+   public Foo(Bar bar)
+   {
+   }
+   
+   @Produces
+   public Foo produceFoo(@Named Bar bar)
+   {
+      return new Foo(bar);
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.byname.broken.injectionPointWithNamed;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class NamedNonFieldInjectionPointTest extends AbstractJSR299Test
+{
+
+   @Test
+   @SpecAssertion(section = "3.11", id = "b")
+   //WELD-427
+   public void testNamedProducerInjectionPointNotAllowed() throws Exception
+   {
+      assert false;
+   }
+
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,28 @@
+/*
+ * 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.byname.broken.injectionPointWithNamed2;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Named;
+
+public class Foo
+{
+   public void observe(@Observes @Named Foo foo)
+   {
+      
+   }
+}

Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,42 @@
+/*
+ * 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.byname.broken.injectionPointWithNamed2;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentFailure;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentFailure.class)
+@SpecVersion(spec="cdi", version="20091101")
+public class NamedNonFieldInjectionPointTest extends AbstractJSR299Test
+{
+
+   @Test
+   @SpecAssertion(section = "3.11", id = "b")
+   //WELD-427
+   public void testNamedObserverMethodInjectionPointNotAllowed() throws Exception
+   {
+      assert false;
+   }
+
+}

Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java	2010-02-05
14:49:55 UTC (rev 5761)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java	2010-02-05
14:57:59 UTC (rev 5762)
@@ -45,7 +45,8 @@
    @SpecAssertions( { 
       @SpecAssertion(section = "5.5", id = "ef"), 
       @SpecAssertion(section = "5.5.2", id = "ae"),
-      @SpecAssertion(section = "5.5.2", id = "bn")
+      @SpecAssertion(section = "5.5.2", id = "bn"),
+      @SpecAssertion(section = "3.8", id = "b")
    })
    public void testInjectionIntoServlet() throws Exception
    {
@@ -57,7 +58,8 @@
    @Test
    @SpecAssertions({
       @SpecAssertion(section = "5.5.2", id = "af"),
-      @SpecAssertion(section = "5.5.2", id = "bm")
+      @SpecAssertion(section = "5.5.2", id = "bm"),
+      @SpecAssertion(section = "3.9", id = "b")
    })
    public void testServletInitializerMethodCalled() throws Exception
    {
@@ -70,7 +72,8 @@
    @SpecAssertions( { 
       @SpecAssertion(section = "5.5", id = "eg"), 
       @SpecAssertion(section = "5.5.2", id = "ag"),
-      @SpecAssertion(section = "5.5.2", id = "bq")
+      @SpecAssertion(section = "5.5.2", id = "bq"),
+      @SpecAssertion(section = "3.8", id = "b")
       })
    public void testInjectionIntoFilter() throws Exception
    {
@@ -82,7 +85,8 @@
    @Test
    @SpecAssertions({
       @SpecAssertion(section = "5.5.2", id = "ah"),
-      @SpecAssertion(section = "5.5.2", id = "bp")
+      @SpecAssertion(section = "5.5.2", id = "bp"),
+      @SpecAssertion(section = "3.9", id = "b")
    })
    public void testFilterInitializerMethodCalled() throws Exception
    {
@@ -94,7 +98,8 @@
    @Test
    @SpecAssertions({
       @SpecAssertion(section = "5.5", id = "ea"),
-      @SpecAssertion(section = "5.5.2", id = "ai")
+      @SpecAssertion(section = "5.5.2", id = "ai"),
+      @SpecAssertion(section = "3.8", id = "b")
    })
    public void testInjectionIntoServletListener() throws Exception
    {
@@ -104,7 +109,10 @@
    }
    
    @Test
-   @SpecAssertion(section = "5.5.2", id = "aj")
+   @SpecAssertions({
+      @SpecAssertion(section = "5.5.2", id = "aj"),
+      @SpecAssertion(section = "3.9", id = "b")
+   })
    public void testServletListenerInitializerMethodCalled() throws Exception
    {
       WebClient webClient = new WebClient();
@@ -116,7 +124,8 @@
    @SpecAssertions({
       @SpecAssertion(section = "5.5", id = "eb"),
       @SpecAssertion(section = "5.5.2", id = "am"),
-      @SpecAssertion(section = "5.5.2", id = "an")
+      @SpecAssertion(section = "5.5.2", id = "an"),
+      @SpecAssertion(section = "3.8", id = "b")
    })
    public void testInjectionIntoTagHandler() throws Exception
    {
@@ -131,7 +140,8 @@
    @Test
    @SpecAssertions({
       @SpecAssertion(section = "5.5", id = "ec"),
-      @SpecAssertion(section = "5.5.2", id="as")
+      @SpecAssertion(section = "5.5.2", id="as"),
+      @SpecAssertion(section = "3.8", id = "b")
    })
    public void testInjectionIntoTagLibraryListener() throws Exception
    {
@@ -141,7 +151,10 @@
    }
    
    @Test
-   @SpecAssertion(section = "5.5.2", id="at")
+   @SpecAssertions({
+      @SpecAssertion(section = "5.5.2", id="at"),
+      @SpecAssertion(section = "3.9", id = "b")
+   })
    public void testTagLibraryListenerInitializerMethodCalled() throws Exception
    {
       WebClient webClient = new WebClient();
@@ -153,7 +166,8 @@
    @SpecAssertions({
       @SpecAssertion(section = "5.5", id = "d"),
       @SpecAssertion(section = "5.5.2", id = "au"),
-      @SpecAssertion(section = "5.5.2", id = "av")
+      @SpecAssertion(section = "5.5.2", id = "av"),
+      @SpecAssertion(section = "3.8", id = "b")
    })
    public void testInjectionIntoJSFManagedBean() throws Exception
    {

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<decorators>
+		<class>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.decorator.FooDecorator_Broken</class>
+	</decorators>
+</beans>

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/interceptor/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<interceptors>
+		<class>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.interceptor.SimpleInterceptor_Broken</class>
+	</interceptors>
+</beans>

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/decorator/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<decorators>
+		<class>org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.decorator.FooDecorator_Broken</class>
+	</decorators>
+</beans>

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/interceptor/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<interceptors>
+		<class>org.jboss.jsr299.tck.tests.implementation.producer.field.definition.broken.interceptor.SimpleInterceptor_Broken</class>
+	</interceptors>
+</beans>

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/decorator/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<decorators>
+		<class>org.jboss.jsr299.tck.tests.implementation.producer.method.broken.decorator.FooDecorator_Broken</class>
+	</decorators>
+</beans>

Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/beans.xml
===================================================================
---
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/beans.xml	
                       (rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/interceptor/beans.xml	2010-02-05
14:57:59 UTC (rev 5762)
@@ -0,0 +1,5 @@
+<beans> 
+	<interceptors>
+		<class>org.jboss.jsr299.tck.tests.implementation.producer.method.broken.interceptor.SimpleInterceptor_Broken</class>
+	</interceptors>
+</beans>

Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2010-02-05 14:49:55 UTC (rev
5761)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2010-02-05 14:57:59 UTC (rev
5762)
@@ -721,7 +721,7 @@
       <text>A managed bean with a constructor that takes no parameters does not
require any special annotations</text>
     </assertion>
     
-    <assertion id="ab">
+    <assertion id="ab" testable="false">
       <text>If the managed bean does not have a constructor that takes no
parameters, it must have a constructor annotated |@Inject|.  No additional special
annotations are required.</text>
     </assertion>
 
@@ -1130,9 +1130,13 @@
       <text>If a non-static method of a session bean class has a parameter
annotated |@Disposes|, and the method is not a business method of the session bean, the
container automatically detects the problem and treats it as a definition
error.</text>
     </assertion>
     
-    <assertion id="g">
-      <text>Interceptors and decorators may not declare disposer methods.  If an
interceptor or decorator has a method annotated |@Disposes|, the container automatically
detects the problem and treats it as a definition error.</text>
+    <assertion id="ga">
+      <text>Interceptors ~and decorators~ may not declare disposer methods.  If an
interceptor ~or decorator~ has a method annotated |@Disposes|, the container automatically
detects the problem and treats it as a definition error.</text>
     </assertion>
+    
+    <assertion id="gb">
+      <text>~Interceptors and ~decorators may not declare disposer methods.  If ~an
interceptor or~ decorator has a method annotated |@Disposes|, the container automatically
detects the problem and treats it as a definition error.</text>
+    </assertion>
 
     <assertion id="h">
       <text>In addition to the disposed parameter, a disposer method may declare
additional parameters, which may also specify qualifiers. These additional parameters are
injection points.</text>
@@ -1271,9 +1275,13 @@
       <text>If a non-static field of a session bean class is annotated |@Produces|,
the container automatically detects the problem and treats it as a definition
error.</text>
     </assertion>
     
-    <assertion id="i">
-      <text>Interceptors and decorators may not declare producer fields.  If an
interceptor or decorator has a field annotated |@Produces|, the container automatically
detects the problem and treats it as a definition error.</text>
+    <assertion id="ia">
+      <text>Interceptors ~and decorators~ may not declare producer fields.  If an
interceptor ~or decorator~ has a field annotated |@Produces|, the container automatically
detects the problem and treats it as a definition error.</text>
     </assertion>
+    
+    <assertion id="ib">
+      <text>Interceptors ~and decorators~ may not declare producer fields.  If ~an
interceptor or~ decorator has a field annotated |@Produces|, the container automatically
detects the problem and treats it as a definition error.</text>
+    </assertion>
   </section>
 
   <section id="3.4.3" title="Default name for a producer
field">
@@ -1428,22 +1436,13 @@
   <section id="3.8" title="Injected fields">
     <group>
       <text>An injected field is a non-static, non-final field of a bean class, or
of any Java EE component class supporting injection.</text>
-    
-      <assertion id="aa">
-        <text>Test a non-static field in a bean class.</text>
+      <assertion id="a">
+        <text>Test a bean class.</text>
       </assertion>
 
-      <assertion id="ab">
-        <text>Test a non-final field in a bean class.</text>
+      <assertion id="b">
+        <text>Test a Java EE component class.</text>
       </assertion>
-
-      <assertion id="ba">
-        <text>Test a non-static field in a Java EE component class.</text>
-      </assertion>
-
-      <assertion id="bb">
-        <text>Test a non-final field in a Java EE component class.</text>
-      </assertion>
     </group>
 
   </section>
@@ -1462,21 +1461,13 @@
     <group>
       <text>An initializer method is a non-abstract, non-static method of a bean
class, or of any Java EE component class supporting injection.</text>
 
-      <assertion id="aaa">
-        <text>Test with a non-abstract method of a bean-class.</text>
+      <assertion id="a">
+        <text>Test a bean-class.</text>
       </assertion>
     
-      <assertion id="aa">
-        <text>Test with a non-static method of a bean class.</text>
+      <assertion id="b">
+        <text>Test a Java EE component class.</text>
       </assertion>
-      
-      <assertion id="caa">
-        <text>Test with a non-abstract method of a Java EE component
class.</text>
-      </assertion>
-      
-      <assertion id="ca">
-        <text>Test with a non-static method of a Java EE component
class.</text>
-      </assertion>
     </group>
 
     <assertion id="e">
@@ -1632,7 +1623,7 @@
       <text>This second bean is enabled, in the sense of Section 5.1.2,
"Enabled and disabled beans", if and only if some other enabled bean has an
injection point with the qualifier |(a)New(X.class)| where |X| is the bean
class.</text>
     </assertion>
     
-    <assertion id="xd">
+    <assertion id="xd" testable="false">
       <text>This bean is called the |@New| qualified bean for the class
|X|.</text>
     </assertion>
     


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[weld-commits] Weld SVN: r5762 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/decorator and 34 other directories.