[webbeans-commits] Webbeans SVN: r1638 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation and 6 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-22 09:57:11 -0500 (Sun, 22 Feb 2009) New Revision: 1638 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/initializer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/DangerCall.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/Dottrel_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Capercaillie.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/DangerCall.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Dottrel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Grouse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Pheasant.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Shrike.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: @Artifactify Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-22 13:58:18 UTC (rev 1637) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -166,19 +166,19 @@ { if (method.isStatic()) { - throw new DefinitionException("Initializer method " + method.toString() + " cannot be static"); + throw new DefinitionException("Initializer method " + method.toString() + " cannot be static on " + getAnnotatedItem()); } else if (method.getAnnotation(Produces.class) != null) { - throw new DefinitionException("Initializer method " + method.toString() + " cannot be annotated @Produces"); + throw new DefinitionException("Initializer method " + method.toString() + " cannot be annotated @Produces on " + getAnnotatedItem()); } else if (method.getAnnotatedParameters(Disposes.class).size() > 0) { - throw new DefinitionException("Initializer method " + method.toString() + " cannot have parameters annotated @Disposes"); + throw new DefinitionException("Initializer method " + method.toString() + " cannot have parameters annotated @Disposes on " + getAnnotatedItem()); } else if (method.getAnnotatedParameters(Observes.class).size() > 0) { - throw new DefinitionException("Initializer method " + method.toString() + " cannot be annotated @Observes"); + throw new DefinitionException("Initializer method " + method.toString() + " cannot be annotated @Observes on " + getAnnotatedItem()); } else { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.ejb.Stateless; -import javax.inject.Initializer; - -@Stateless -class AndalusianChicken implements LocalChicken -{ - - public void firstBusinessMethod() - { - } - - @Initializer - public void nonBusinessMethod() - { - } -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer; + +import javax.ejb.Stateless; +import javax.inject.Initializer; + +@Stateless +public class AndalusianChicken implements LocalChicken +{ + + public static boolean nonBusinessMethodCalled = false; + + public void firstBusinessMethod() + { + } + + @Initializer + public void nonBusinessMethod() + { + nonBusinessMethodCalled = true; + } + + public void cluck() + { + } +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Capercaillie.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Capercaillie.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Capercaillie.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Disposes; -import javax.inject.Initializer; - -class Capercaillie -{ - - @Initializer - public void setName(String name, @Disposes ChickenHutch chickenHutch) - { - // No-op - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/DangerCall.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/DangerCall.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/DangerCall.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Production; - -@Production -class DangerCall -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Dottrel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Dottrel.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Dottrel.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Initializer; - -class Dottrel -{ - - @Initializer - public static void setName(String name) - { - // No-op - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.EAR) +@IntegrationTest +public class EjbInitializerMethodTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "initializerMethod", "ejb3" }) + @SpecAssertion(section = "3.9", id = "c") + public void testInitializerMethodNotABusinessMethod() + { + AndalusianChicken.nonBusinessMethodCalled = false; + getCurrentManager().getInstanceByType(LocalChicken.class).cluck(); + assert AndalusianChicken.nonBusinessMethodCalled = true; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Grouse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Grouse.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Grouse.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.event.Observes; -import javax.inject.Initializer; - -class Grouse -{ - - @Initializer - public void setName(String name, @Observes DangerCall dangerCall) - { - // No-op - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,28 +1,24 @@ package org.jboss.jsr299.tck.unit.implementation.initializer; import javax.inject.DefinitionException; -import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.util.MockCreationalContext; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; import org.testng.annotations.Test; /** * * Spec version: PRD2 */ +@Artifact +(a)Packaging(PackagingType.EAR) public class InitializerMethodTest extends AbstractDeclarativeTest { - @Test(expectedExceptions = DefinitionException.class, groups = "initializerMethod") - @SpecAssertion(section = "3.9", id = "a") - public void testStaticInitializerMethodNotAllowed() - { - createSimpleBean(Dottrel.class); - } - @Test(groups = { "stub", "initializerMethod", "servlet", "integration" }) @SpecAssertion(section = "3.9", id = "d") public void testInitializerMethodCalledOnServlet() @@ -51,17 +47,6 @@ assert false; } - /** - * If the bean is a session bean, the initializer method is not required to - * be a business method of the session bean - */ - @Test(groups = { "initializerMethod", "ejb3" }) - @SpecAssertion(section = "3.9", id = "c") - public void testInitializerMethodNotABusinessMethod() - { - deployBeans(LocalChicken.class, AndalusianChicken.class); - } - @Test(groups = { "stub", "initializerMethod", "interceptors" }) @SpecAssertion(section = "3.9", id = "f") public void testMethodInterceptorNotCalledOnInitializerMethod() @@ -75,36 +60,11 @@ @SpecAssertion(section = "5.3", id = "b") }) public void testMultipleInitializerMethodsAreCalled() { - getCurrentManager().addBean(createSimpleBean(Fox.class)); - getCurrentManager().addBean(createSimpleBean(Chicken.class)); - - Bean<ChickenHutch> chickenHutchBean = createSimpleBean(ChickenHutch.class); - ChickenHutch chickenHutch = chickenHutchBean.create(new MockCreationalContext<ChickenHutch>()); + ChickenHutch chickenHutch = getCurrentManager().getInstanceByType(ChickenHutch.class); assert chickenHutch.fox != null; assert chickenHutch.chicken != null; } - @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "b"), @SpecAssertion(section = "3.4.2", id = "c") }) - public void testInitializerMethodAnnotatedProduces() - { - createSimpleBean(Pheasant.class); - } - - @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.9.1", id = "c") - public void testInitializerMethodHasParameterAnnotatedDisposes() - { - createSimpleBean(Capercaillie.class); - } - - @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.9.1", id = "d") - public void testInitializerMethodHasParameterAnnotatedObserves() - { - createSimpleBean(Grouse.class); - } - @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) @SpecAssertion(section = "3.9.2", id = "a") public void testInitializerMethodDeclaredInXml() @@ -133,10 +93,4 @@ assert false; } - /* - * - * @Test(groups="initializerMethod") @SpecAssertion(section="3.8") public - * void test { assert false; } - */ - } \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.ejb.Local; - -@Local -public interface LocalChicken -{ - public void firstBusinessMethod(); -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer; + +import javax.ejb.Local; + +@Local +public interface LocalChicken +{ + public void firstBusinessMethod(); + + public void cluck(); +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Pheasant.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Pheasant.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Pheasant.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Initializer; -import javax.inject.Produces; - -class Pheasant -{ - - @Initializer - @Produces - public void setName(String name) - { - // No-op - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Shrike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Shrike.java 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Shrike.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.initializer; - -import javax.inject.Initializer; - -class Shrike -{ - - - @Initializer - public void setName(String name) - { - // No-op - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.methodAnnotatedProduces; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class MethodAnnotatedProducesTest extends AbstractDeclarativeTest +{ + + @Test(groups = "initializerMethod") + @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "b"), @SpecAssertion(section = "3.4.2", id = "c") }) + public void testInitializerMethodAnnotatedProduces() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Pheasant.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/methodAnnotatedProduces/Pheasant_Broken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.methodAnnotatedProduces; + +import javax.inject.Initializer; +import javax.inject.Produces; + +class Pheasant_Broken +{ + + @Initializer + @Produces + public void setName(String name) + { + // No-op + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Capercaillie.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/Capercaillie_Broken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; + +import javax.inject.Disposes; +import javax.inject.Initializer; + +class Capercaillie_Broken +{ + + @Initializer + public void setName(String name, @Disposes ChickenHutch chickenHutch) + { + // No-op + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; + + +class ChickenHutch +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ChickenHutch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedDisposes; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class ParameterAnnotatedDisposesTest extends AbstractDeclarativeTest +{ + + + @Test(groups = "initializerMethod") + @SpecAssertion(section = "3.9.1", id = "c") + public void testInitializerMethodHasParameterAnnotatedDisposes() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/DangerCall.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/DangerCall.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/DangerCall.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/DangerCall.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; + +import javax.inject.Production; + +@Production +class DangerCall +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Grouse.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/Grouse_Broken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; + +import javax.event.Observes; +import javax.inject.Initializer; + + +class Grouse_Broken +{ + + @Initializer + public void setName(String name, @Observes DangerCall dangerCall) + { + // No-op + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.parameterAnnotatedObserves; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class ParameterAnnotatedObservesTest extends AbstractDeclarativeTest +{ + + + @Test(groups = "initializerMethod") + @SpecAssertion(section = "3.9.1", id = "d") + public void testInitializerMethodHasParameterAnnotatedObserves() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/Dottrel_Broken.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/Dottrel.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/Dottrel_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/Dottrel_Broken.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.staticInitializer; + +import javax.inject.Initializer; + +class Dottrel_Broken +{ + + @Initializer + public static void setName(String name) + { + // No-op + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-22 14:57:11 UTC (rev 1638) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer.staticInitializer; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class StaticInitializerTest extends AbstractDeclarativeTest +{ + + @Test(groups = "initializerMethod") + @SpecAssertion(section = "3.9", id = "a") + public void testStaticInitializerMethodNotAllowed() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-22 13:58:18 UTC (rev 1637) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-22 14:57:11 UTC (rev 1638) @@ -5,6 +5,8 @@ <method-selectors> <method-selector> <selector-class name="org.jboss.jsr299.tck.impl.testng.DisableIntegrationTestsMethodSelector" /> + </method-selector> + <method-selector> <selector-class name="org.jboss.jsr299.tck.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> </method-selector> </method-selectors>