February 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1644 - tck/trunk.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 15:46:23 -0500 (Sun, 22 Feb 2009) New Revision: 1644 Modified: tck/trunk/pom.xml Log: allow any version of eclipse plugin Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-02-22 20:41:32 UTC (rev 1643) +++ tck/trunk/pom.xml 2009-02-22 20:46:23 UTC (rev 1644) @@ -275,9 +275,9 @@ <version>2.0.9</version> </requireMavenVersion> <requirePluginVersions> - <additionalPlugins> - <additionalPlugin>org.apache.maven.plugins:maven-eclipse-plugin</additionalPlugin> - </additionalPlugins> + <unCheckedPlugins> + <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin> + </unCheckedPlugins> </requirePluginVersions> </rules> </configuration>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1643 - tck/trunk.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 15:41:32 -0500 (Sun, 22 Feb 2009) New Revision: 1643 Modified: tck/trunk/pom.xml Log: allow any version of eclipse plugin Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-02-22 20:41:21 UTC (rev 1642) +++ tck/trunk/pom.xml 2009-02-22 20:41:32 UTC (rev 1643) @@ -274,7 +274,11 @@ <requireMavenVersion> <version>2.0.9</version> </requireMavenVersion> - <requirePluginVersions /> + <requirePluginVersions> + <additionalPlugins> + <additionalPlugin>org.apache.maven.plugins:maven-eclipse-plugin</additionalPlugin> + </additionalPlugins> + </requirePluginVersions> </rules> </configuration> </execution>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1642 - ri/trunk.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 15:41:21 -0500 (Sun, 22 Feb 2009) New Revision: 1642 Modified: ri/trunk/pom.xml Log: allow any version of eclipse plugin Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-02-22 19:14:50 UTC (rev 1641) +++ ri/trunk/pom.xml 2009-02-22 20:41:21 UTC (rev 1642) @@ -461,6 +461,21 @@ <version>1.1</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <version>1.0-alpha-1</version> + <configuration> + <forkMode>once</forkMode> + <metadataFile>../target/coverage.em</metadataFile> + <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0-alpha-4</version> @@ -476,7 +491,9 @@ <version>2.0.9</version> </requireMavenVersion> <requirePluginVersions> - <message>Must specify plugin versions in pluginManagement in root org.jboss.webbeans:parent pom</message> + <additionalPlugins> + <additionalPlugin>org.apache.maven.plugins:maven-eclipse-plugin</additionalPlugin> + </additionalPlugins> </requirePluginVersions> </rules> </configuration> @@ -489,44 +506,32 @@ <profiles> <profile> - <id>coverage</id> + <id>api-coverage</id> <activation> <property> - <name>coverage</name> + <name>apiCoverage</name> </property> </activation> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-1</version> - <inherited>true</inherited> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - - <goal>instrument</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <inherited>true</inherited> <configuration> <forkMode>once</forkMode> - <reportFormat>xml</reportFormat> - <classesDirectory> - ${project.build.directory}/generated-classes/emma/classes - </classesDirectory> </configuration> - </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + <scope>test</scope> + </dependency> + </dependencies> </profile> </profiles>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1641 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/initializer and 12 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 14:14:50 -0500 (Sun, 22 Feb 2009) New Revision: 1641 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.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/InitializerMethodTest.java 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/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Minor improvements to mappings Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -20,7 +20,7 @@ public class TooManyDeployElementsTest { - @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.5", id = "e") + @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.6", id = "e") public void testTooManyDeployElements() { assert false; Modified: 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 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.unit.implementation.initializer; 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.IntegrationTest; @@ -15,7 +16,10 @@ { @Test(groups = { "initializerMethod", "ejb3" }) - @SpecAssertion(section = "3.9", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "3.9", id = "e"), + @SpecAssertion(section = "3.9", id = "c") + }) public void testInitializerMethodNotABusinessMethod() { AndalusianChicken.nonBusinessMethodCalled = false; 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 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -55,9 +55,12 @@ } @Test(groups = { "initializerMethod" }) - @SpecAssertions( { + @SpecAssertions({ @SpecAssertion(section = "3.9", id = "g"), - @SpecAssertion(section = "5.3", id = "b") }) + @SpecAssertion(section = "5.3", id = "b"), + @SpecAssertion(section = "3.9.1", id = "a"), + @SpecAssertion(section = "3.9.3", id = "a") + }) public void testMultipleInitializerMethodsAreCalled() { ChickenHutch chickenHutch = getCurrentManager().getInstanceByType(ChickenHutch.class); Modified: 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 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -14,7 +14,7 @@ { @Test(groups = "initializerMethod") - @SpecAssertion(section = "3.9", id = "a") + @SpecAssertion(section = "3.9", id = "aa") public void testStaticInitializerMethodNotAllowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -93,7 +93,11 @@ } @Test(groups = { "producerField", "deployment" }) - @SpecAssertion(section = "3.5", id = "j") + @SpecAssertions({ + @SpecAssertion(section = "3.5", id = "j"), + @SpecAssertion(section = "3.5", id = "c"), + @SpecAssertion(section = "3.5.2", id ="a") + }) public void testBeanDeclaresMultipleProducerFields() { deployBeans(OtherSpiderProducer.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -35,7 +35,10 @@ } @Test(groups = { "producerField" }) - @SpecAssertion(section = "6.8", id = "h") + @SpecAssertions({ + @SpecAssertion(section = "6.8", id = "h"), + @SpecAssertion(section = "3.5", id = "b") + }) public void testProducerStaticFieldBean() { deployBeans(StaticTarantulaProducer.class, TarantulaConsumer.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -164,7 +164,7 @@ @SpecAssertions({ @SpecAssertion(section = "3.4.2", id = "bb"), @SpecAssertion(section = "2.6.1", id = "d"), - @SpecAssertion(section = "2.4.12", id = "a") + @SpecAssertion(section = "3.4.12", id = "a") }) public void testDefaultNamedMethod() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -61,17 +61,19 @@ } @Test(groups = { "producerMethod", "broken" }) - @SpecAssertions( { @SpecAssertion(section = "3.4", id = "e"), - @SpecAssertion(section = "B.1", id = "unknown"), - @SpecAssertion(section = "7.3", id = "unknown") }) + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "e"), + @SpecAssertion(section = "7.3", id = "unknown") + }) public void testProducerMethodReturnsNullIsDependent() throws Exception { assert getCurrentManager().getInstanceByType(Spider.class, new AnnotationLiteral<Null>() {}) == null; } @Test(groups = "producerMethod", expectedExceptions = IllegalProductException.class) - @SpecAssertions( { @SpecAssertion(section = "3.4", id = "f"), - @SpecAssertion(section = "B.1", id = "unknown") }) + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "f") + }) public void testProducerMethodReturnsNullIsNotDependent() throws Exception { assert getCurrentManager().resolveByType(Spider.class, new AnnotationLiteral<Request>() {}).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -118,7 +118,10 @@ } @Test(groups = "injection") - @SpecAssertion(section = "6.4", id = "e") + @SpecAssertions({ + @SpecAssertion(section = "6.4", id = "e"), + @SpecAssertion(section = "3.8.1", id = "a") + }) public void testCreateInjectsFieldsDeclaredInJava() { assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -1,6 +1,7 @@ package org.jboss.jsr299.tck.unit.lookup.byname; import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; @@ -18,4 +19,27 @@ { assert false; } + + + @Test(groups = { "resolution", "el" }) + @SpecAssertions({ + @SpecAssertion(section = "5.10", id = "d"), + @SpecAssertion(section = "5.10", id = "c") + }) + public void testGetInstanceByName() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().resolveByName("nonexistant").size() == 0; + assert getCurrentManager().getInstanceByName("nonexistant") == null; + assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon; + } + + }.run(); + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.unit.lookup.byname; 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.jsr299.BeansXml; @@ -17,41 +16,7 @@ public class ResolutionByNameTest extends AbstractDeclarativeTest { - @Test(groups = { "resolution", "el" }) - @SpecAssertions({ - @SpecAssertion(section = "5.10", id = "d"), - @SpecAssertion(section = "5.10", id = "c") - }) - public void testELResolver() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().resolveByName("nonexistant").size() == 0; - assert getCurrentManager().getInstanceByName("nonexistant") == null; - assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon; - } - - }.run(); - } - - /** - * The following algorithm must be used by the container when resolving a - * bean by name: - * - * The container identifies the set of matching enabled beans which have - * the given name. - * - * Next, the container examines the deployment types of the matching beans, - * as defined in Section 2.5.7, "Deployment type precedence", and returns the - * set of beans with the highest precedence deployment type that occurs in - * the set. If there are no matching beans, an empty set is returned. - * @throws Exception - */ - @Test(groups = { "resolution", "el" }) + @Test(groups = { "resolution" }) @SpecAssertion(section = "5.11", id = "c") public void testOnlyHighestPrecedenceResolved() throws Exception { @@ -63,7 +28,8 @@ @Override protected void execute() throws Exception { - assert getCurrentManager().getInstanceByName("whitefish") instanceof Plaice; + assert getCurrentManager().resolveByName("whitefish").size() == 1; + assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -57,7 +57,7 @@ } @Test - @SpecAssertion(section = "review", id = "review") + @SpecAssertion(section = "5.4.2", id = "a") public void testClientProxyInvocation() { Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -9,14 +9,14 @@ import org.testng.annotations.Test; @Artifact -// TODO This test can be fixed by specifying the exception that is expected as below @ExpectedDeploymentException(UnproxyableDependencyException.class) public class UnproxyableTest extends AbstractDeclarativeTest { @Test - @SpecAssertion(section = "5.4.1", id = "e") + @SpecAssertion(section = "5.4.1", id = "ba") public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean() { + assert false; } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.lookup.injection; + +import javax.inject.Current; + +class BeanWithFinalBoundField_Broken +{ + + @Current public final Tuna tuna = null; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.lookup.injection; + +import javax.inject.Current; + +class BeanWithStaticBoundField_Broken +{ + + @Current public static Tuna tuna; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -99,5 +99,22 @@ { assert false; } + + @Test(groups = {"injection", "underInvestigation"}) + @SpecAssertion(section = "3.8", id = "aa") + public void testInjectingStaticField() + { + assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1; + assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null; + } + + @Test(groups = {"injection", "underInvestigation"}) + @SpecAssertion(section = "3.8", id = "ab") + public void testInjectingFinalField() + { + assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1; + assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -274,7 +274,10 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6.1", id = "zc") + @SpecAssertions({ + @SpecAssertion(section = "5.6.1", id = "zc"), + @SpecAssertion(section = "5.6.1", id = "ab") + }) public void testApiTypeInjectionPoint() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); @@ -295,7 +298,10 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6.1", id = "zd") + @SpecAssertions({ + @SpecAssertion(section = "5.6.1", id = "zd"), + @SpecAssertion(section = "5.6.1", id = "a") + }) public void testCurrentBinding() { deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-22 19:14:50 UTC (rev 1641) @@ -69,7 +69,10 @@ } @Test(groups="resolution") - @SpecAssertion(section="5.9", id = "a") + @SpecAssertions({ + @SpecAssertion(section="5.9", id = "a"), + @SpecAssertion(section = "5.9", id ="fa") + }) public void testResolveByType() throws Exception { @@ -102,9 +105,10 @@ @Test(groups="injection") @SpecAssertions({ - @SpecAssertion(section = "2.3.5", id = "b"), - @SpecAssertion(section = "5.9", id = "gb"), - @SpecAssertion(section = "2.3.3", id = "d") + @SpecAssertion(section = "2.3.5", id = "b" ), + @SpecAssertion(section = "5.9", id = "gb"), + @SpecAssertion(section = "2.3.3", id = "d" ), + @SpecAssertion(section = "5.9.2", id = "a" ) }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-22 17:14:04 UTC (rev 1640) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-22 19:14:50 UTC (rev 1641) @@ -1556,8 +1556,9 @@ <text>If a producer field return type contains a type variable, a DefinitionException is thrown by the container at deployment time</text> </assertion> - <assertion id="i"> + <assertion id="i" testable="false"> <text>The application may access producer fields directly. However, if the application accesses a producer field directly, the returned object is not bound to any context; and its lifecycle is not managed by the container</text> + <note>This is a statement of intent</note> </assertion> <assertion id="j"> @@ -1678,8 +1679,9 @@ <text>A resource may not declare a bean name</text> </assertion> - <assertion id="m"> + <assertion id="m" testable="false"> <text>Resources are always declared using XML</text> + <note>This is a statement of intent</note> </assertion> </section> @@ -1931,16 +1933,14 @@ <section id="3.8" title="Injected fields"> - <assertion id="a"> - <text>An injected field is a non-static, non-final field of a bean class.</text> + <assertion id="aa"> + <text>An injected field is a non-static~, non-final~ field of a bean class.</text> </assertion> - <assertion id="a"> - <text>An injected field is a non-static, non-final field of a bean class.</text> + <assertion id="aa"> + <text>An injected field is a ~non-static, ~non-final field of a bean class.</text> </assertion> - - <assertion id="b"> <text>An injected field is a non-static, non-final field of a servlet.</text> <note>Test needs to check that static and final fields aren't injected and also that no exception is thrown when you have them</note> @@ -2006,11 +2006,11 @@ </section> <section id="3.9" title="Initializer methods"> - <assertion id="a"> + <assertion id="aa"> <text>An initializer method is a non-static method of a bean class.</text> </assertion> - <assertion id="a"> + <assertion id="ab"> <text>An initializer method is a non-static method of a servlet.</text> </assertion> @@ -2038,8 +2038,9 @@ <text>A bean class may declare multiple (or zero) initializer methods</text> </assertion> - <assertion id="h"> + <assertion id="h" testable="false"> <text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text> + <note>This is a statement of intent</note> </assertion> <assertion id="i"> @@ -2126,8 +2127,9 @@ </section> <section id="3.11" title="The Bean object for a bean"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>Concrete subclasses of Bean must implement the operations defined by the Contextual interface defined in Section 6.1, "The Contextual interface".</text> + <note>This is asserted by the JLS</note> </assertion> <assertion id="b"> @@ -2385,6 +2387,7 @@ <assertion id="b"> <text>The container is required to support circularities in the bean dependency graph</text> + <note>The RI has unit tests for this atm</note> </assertion> </section> @@ -2392,6 +2395,7 @@ <assertion id="a"> <text>The container must validate all injection points of all enabled beans at deployment time to ensure that there are no unsatisfied or ambiguous dependencies. If an unsatisfied or ambiguous dependency exists, an UnsatisfiedDependencyException or AmbiguousDependencyException is thrown by the container at deployment time, as defined in Section 5.7.1, "Resolving dependencies".</text> + <note>These need expanding out - one for each assertion that results in an exception in 5.7.1</note> </assertion> </section> @@ -2399,10 +2403,10 @@ <assertion id="aa"> - <text>If necessary, the container performs boxing when it injects a value to a field or parameter of primitive or wrapper type.</text> + <text>If necessary, the container performs boxing ~or unboxing~ when it injects a value to a field or parameter of primitive or wrapper type.</text> </assertion> <assertion id="ab"> - <text>If necessary, the container performs boxing or unboxing when it injects a value to a field or parameter of primitive or wrapper type.</text> + <text>If necessary, the container performs ~boxing or~ unboxing when it injects a value to a field or parameter of primitive or wrapper type.</text> </assertion> <assertion id="a"> @@ -2444,24 +2448,24 @@ <section id="5.4.1" title="Unproxyable bean types"> <assertion id="a"> - <text>Classes without a non-private constructor with no parameters cannot be proxied by the container</text> + <text>Classes without a non-private constructor with no parameters cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time.</text> </assertion> - <assertion id="b"> - <text>Classes which are declared final or have final methods cannot be proxied by the container</text> + <assertion id="ba"> + <text>Classes which are declared final ~or have final methods~ cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text> </assertion> + <assertion id="bb"> + <text>Classes which ~are declared final or ~have final methods cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text> + </assertion> + <assertion id="c"> - <text>Primitive types cannot be proxied by the container</text> + <text>Primitive types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text> </assertion> <assertion id="d"> - <text>Array types cannot be proxied by the container</text> + <text>Array types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text> </assertion> - - <assertion id="e"> - <text>If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text> - </assertion> </section> <section id="5.4.2" title="Client proxy invocation"> @@ -2687,8 +2691,9 @@ <text>If the Bean instance represents a bean with a pseudo-scope, as defined in Section 8.2, "Normal scopes and pseudo-scopes", Manager.getInstance() must obtain the context object by calling Manager.getContext(), passing the bean scope, then obtain an instance of the bean by calling Context.get(), passing the Bean instance representing the bean and an instance of CreationalContext</text> </assertion> - <assertion id="g"> + <assertion id="g" testable="false"> <text>The Manager.getInstanceByType() methods obtain a contextual instance of a bean</text> + <note>A statement of intent</note> </assertion> <assertion id="h"> @@ -2937,13 +2942,8 @@ <text>The Manager.getInstanceByName() method must throw an AmbiguousDependencyException if Manager.resolveByName() returned more than one bean</text> </assertion> - <assertion id="e"> - <text>The Manager.getInstanceByName() method must obtain an instance of the bean by calling Manager.getInstance(), passing the Bean instance representing the bean if exactly one bean was returned by Manager.resolveByName()</text> - </assertion> - <assertion id="f"> - <text>For each distinct name that appears in the EL expression, getInstanceByName() must be called at most once</text> - <note>This is surely part of e?!</note> + <text>The Manager.getInstanceByName() method must obtain an instance of the bean by calling Manager.getInstance(), passing the Bean instance representing the bean if exactly one bean was returned by Manager.resolveByName(). For each distinct name that appears in the EL expression, getInstanceByName() must be called at most once</text> </assertion> <assertion id="g">

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1640 - tck/trunk/impl.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 12:14:04 -0500 (Sun, 22 Feb 2009) New Revision: 1640 Modified: tck/trunk/impl/pom.xml Log: attach coverage report Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-02-22 15:04:17 UTC (rev 1639) +++ tck/trunk/impl/pom.xml 2009-02-22 17:14:04 UTC (rev 1640) @@ -152,68 +152,67 @@ </plugins> </build> - <profiles> - <profile> - <id>tck-audit</id> - <activation> - <property> - <name>tck-audit</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils-impl</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> + <profiles> + <profile> + <id>tck-audit</id> + <activation> + <property> + <name>tck-audit</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils-impl</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> <configuration> - <rules> - <requireJavaVersion> - <version>1.6</version> - </requireJavaVersion> - </rules> + <source>1.6</source> + <target>1.6</target> + <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument> </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>auto-clean</id> - <phase>initialize</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - <defaultGoal>compile</defaultGoal> - </build> - </profile> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.6</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <defaultGoal>compile</defaultGoal> + </build> + </profile> <profile> <id>write-artifacts-to-disk</id> <activation> @@ -256,6 +255,52 @@ </plugins> </build> </profile> + + <profile> + <id>attach-audit</id> + <activation> + <property> + <name>attach-audit</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${basedir}/src/main/resources/tck-tests.xml</file> + <type>xml</type> + <classifier>suite</classifier> + </artifact> + <artifact> + <file>${basedir}/src/main/resources/tck-audit.xml</file> + <type>xml</type> + <classifier>audit</classifier> + </artifact> + <artifact> + <file>../target/coverage.html</file> + <type>html</type> + <classifier>coverage</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1639 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 10:04:17 -0500 (Sun, 22 Feb 2009) New Revision: 1639 Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java Log: Remove createSimpleBean Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-22 14:57:11 UTC (rev 1638) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-22 15:04:17 UTC (rev 1639) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.spi; -import javax.inject.manager.Bean; /** * Provides Bean related operations. @@ -19,21 +18,8 @@ { public static final String PROPERTY_NAME = Beans.class.getName(); - + /** - * Create a new simple bean from the given class - * - * @param <T> The type of the bean - * @param clazz the class to create the bean - * @return the created bean - * - * Deprecated, {@link StandaloneContainers#deploy(Iterable, Iterable)} should - * be used. This method will be removed when the TCK is released. - */ - @Deprecated - public <T> Bean<T> createSimpleBean(Class<T> clazz); - - /** * Tests whether the given class is declaring an Enterprise Bean. * * @param clazz the type of bean being tested Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-22 14:57:11 UTC (rev 1638) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-22 15:04:17 UTC (rev 1639) @@ -15,7 +15,6 @@ import javax.context.CreationalContext; import javax.inject.Production; import javax.inject.Standard; -import javax.inject.manager.Bean; import javax.inject.manager.Manager; import org.jboss.jsr299.tck.api.Configuration; @@ -68,12 +67,6 @@ } private Manager currentManager; - - @Deprecated - public <T> Bean<T> createSimpleBean(Class<T> beanClass) - { - return getCurrentConfiguration().getBeans().createSimpleBean(beanClass); - } /** * Used to deploy simple beans in a standalone container.

17 years, 1 month

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

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>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1637 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 08:58:18 -0500 (Sun, 22 Feb 2009) New Revision: 1637 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/MountainLion.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java Log: @Artifactify Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java 2009-02-22 13:17:56 UTC (rev 1636) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -4,7 +4,7 @@ @Specializes @AnotherDeploymentType -public class MountainLion extends Lion +class MountainLion extends Lion { } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-22 13:17:56 UTC (rev 1636) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -1,308 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple; - -import java.lang.annotation.Annotation; -import java.util.List; - -import javax.inject.AnnotationLiteral; -import javax.inject.CreationException; -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.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class SimpleBeanLifecycleTest extends AbstractDeclarativeTest -{ - private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() - { - }; - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - @Test(groups = "beanConstruction") - @SpecAssertions({ - @SpecAssertion(section = "3.2.6.3", id = "a"), - @SpecAssertion(section = "2.3.6", id = "d") - }) - public void testInjectionOfParametersIntoBeanConstructor() - { - Bean<FishPond> goldfishPondBean = createSimpleBean(FishPond.class); - Bean<Goldfish> goldfishBean = createSimpleBean(Goldfish.class); - getCurrentManager().addBean(goldfishBean); - getCurrentManager().addBean(goldfishPondBean); - FishPond fishPond = goldfishPondBean.create(new MockCreationalContext<FishPond>()); - assert fishPond.goldfish != null; - } - - @Test - @SpecAssertion(section = "3.2.6.3", id = "a") - public void testBindingTypeAnnotatedConstructor() throws Exception - { - deployBeans(Duck.class); - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Duck.class); - assert Duck.constructedCorrectly; - } - }.run(); - } - - @Test(groups = { "broken", "specialization" }) - @SpecAssertion(section = "3.2.7", id = "c") - public void testSpecializedBeanAlwaysUsed() throws Exception - { - deployBeans(Lion.class, MountainLion.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().getInstanceByType(Lion.class, TAME_LITERAL) instanceof MountainLion; - } - - }.run(); - } - - @Test(groups = "beanLifecycle") - @SpecAssertions({ - @SpecAssertion(section = "6.2", id = "a"), - @SpecAssertion(section="2", id="g"), - @SpecAssertion(section="2.2", id="f"), - @SpecAssertion(section="3.2.6", id="a") - }) - public void testCreateReturnsInstanceOfBean() - { - Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); - assert bean.create(new MockCreationalContext<RedSnapper>()) instanceof RedSnapper; - } - - @Test(groups = { "stub", "beanLifecycle", "interceptors" }) - @SpecAssertion(section = "6.2", id = "b") - public void testCreateBindsInterceptorStack() - { - assert false; - } - - @Test(groups = { "stub", "beanLifecycle", "decorators" }) - @SpecAssertion(section = "6.2", id = "c") - public void testCreateBindsDecoratorStack() - { - assert false; - } - - @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) - @SpecAssertion(section = "6.4", id = "b") - public void testCreateInjectsEjb() - { - assert false; - } - - @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) - @SpecAssertion(section = "6.4", id = "c") - public void testCreateInjectsPersistenceContext() - { - assert false; - } - - @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) - @SpecAssertion(section = "6.4", id = "d") - public void testCreateInjectsResource() - { - assert false; - } - - @Test(groups = "injection") - @SpecAssertion(section = "6.4", id = "e") - public void testCreateInjectsFieldsDeclaredInJava() - { - Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); - assert tunaFarm.tuna != null; - } - - @Test(groups = { "beanLifecycle", "lifecycleCallbacks" }) - @SpecAssertions({ - @SpecAssertion(section = "6.2", id = "f"), - @SpecAssertion(section = "6.3", id = "b") - }) - public void testPostConstructPreDestroy() throws Exception - { - Bean<FarmOffice> farmOfficeBean = createSimpleBean(FarmOffice.class); - Bean<Farm> farmBean = createSimpleBean(Farm.class); - getCurrentManager().addBean(farmOfficeBean); - getCurrentManager().addBean(farmBean); - Farm farm = farmBean.create(new MockCreationalContext<Farm>()); - assert farm.founded != null; - assert farm.initialStaff == 20; - assert farm.closed == null; - farmBean.destroy(farm); - assert farm.closed != null; - } - - /** - * If X declares an initializer method, @PostConstruct method or @PreDestroy - * method x() then Y inherits x() if and only if neither Y nor any - * intermediate class that is a subclass of X and a superclass of Y overrides - * the method x(). - * - * @throws Exception - */ - @Test - @SpecAssertion(section = "4.2", id = "ba") - public void testSubClassInheritsPostConstructOnSuperclass() throws Exception - { - OrderProcessor.postConstructCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - bean.create(new MockCreationalContext<CdOrderProcessor>()); - } - }.run(); - assert OrderProcessor.postConstructCalled; - } - - /** - * If X declares an initializer method, @PostConstruct method or @PreDestroy - * method x() then Y inherits x() if and only if neither Y nor any - * intermediate class that is a subclass of X and a superclass of Y overrides - * the method x(). - * - * @throws Exception - */ - @Test - @SpecAssertion(section = "4.2", id = "bb") - public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception - { - OrderProcessor.preDestroyCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - CdOrderProcessor instance = bean.create(new MockCreationalContext<CdOrderProcessor>()); - bean.destroy(instance); - } - }.run(); - assert OrderProcessor.preDestroyCalled; - } - - /** - * If X declares an initializer method, @PostConstruct method or @PreDestroy - * method x() then Y inherits x() if and only if neither Y nor any - * intermediate class that is a subclass of X and a superclass of Y overrides - * the method x(). - * - * @throws Exception - */ - @Test - @SpecAssertion(section = "4.2", id = "ba") - public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception - { - - OrderProcessor.postConstructCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - bean.create(new MockCreationalContext<NovelOrderProcessor>()); - } - }.run(); - assert !OrderProcessor.postConstructCalled; - } - - /** - * If X declares an initializer method, @PostConstruct method or @PreDestroy - * method x() then Y inherits x() if and only if neither Y nor any - * intermediate class that is a subclass of X and a superclass of Y overrides - * the method x(). - * - * @throws Exception - */ - @Test - @SpecAssertion(section = "4.2", id = "bb") - public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception - { - OrderProcessor.preDestroyCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - NovelOrderProcessor instance = bean.create(new MockCreationalContext<NovelOrderProcessor>()); - bean.destroy(instance); - } - }.run(); - assert !OrderProcessor.preDestroyCalled; - - } - - @Test(groups = "injection") - @SpecAssertion(section = "outdated", id = "outdated") - public void testFieldMissingBindingAnnotationsAreNotInjected() - { - Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); - assert tunaFarm.notInjectedTuna != getCurrentManager().getInstance(tunaBean); - } - - @Test(expectedExceptions = CreationException.class) - @SpecAssertion(section = "6.2", id = "h") - public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception - { - deployBeans(Lorry_Broken.class); - new RunInDependentContext() - { - - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Lorry_Broken.class); - } - - }.run(); - } - - @Test(expectedExceptions = FooException.class) - @SpecAssertion(section = "6.2", id = "g") - public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception - { - deployBeans(Van_Broken.class); - new RunInDependentContext() - { - - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Van_Broken.class); - } - - }.run(); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +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.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class BookOrderProcessor extends OrderProcessor +{ + + @Override + public void postConstruct() {} + + @Override + public void preDestroy() {} + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/BookOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class CdOrderProcessor extends OrderProcessor +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/CdOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,29 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; + + +@Production +class Duck +{ + + @Produces public static String foo = "foo"; + + @Produces public static Integer bar = 1; + + @Produces @Synchronous public static Integer synchronousBar = 2; + + public static boolean constructedCorrectly = false; + + @Initializer + public Duck(String foo, @Synchronous Integer bar) + { + if (foo.equals(Duck.foo) && bar.equals(Duck.synchronousBar)) + { + constructedCorrectly = true; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Duck.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,32 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import java.util.Date; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Current; + +class Farm +{ + + public Date founded; + public Date closed; + public int initialStaff; + + @Current + FarmOffice farmOffice; + + @PostConstruct + private void postConstruct() + { + founded = new Date(); + initialStaff = farmOffice.noOfStaff; + } + + @PreDestroy + private void preDestroy() + { + closed = new Date(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Farm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + + +class FarmOffice +{ + + public int noOfStaff = 20; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FarmOffice.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.inject.Initializer; + +class FishPond +{ + + public Animal goldfish; + + @Initializer + public FishPond(Goldfish goldfish) + { + this.goldfish = goldfish; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishPond.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishStereotype.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Named; +import javax.annotation.Stereotype; +import javax.context.ApplicationScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +@interface FishStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class FooException extends RuntimeException +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/FooException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.context.RequestScoped; +import javax.inject.Production; + +@RequestScopedAnimalStereotype +@RequestScoped +@Production +class Goldfish implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Goldfish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +@Tame +class Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class Lorry_Broken +{ + + public Lorry_Broken() throws Exception + { + throw new Exception(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Lorry_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/MountainLion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/MountainLion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/MountainLion.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class MountainLion extends Lion +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/MountainLion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class NovelOrderProcessor extends BookOrderProcessor +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/NovelOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,31 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +class OrderProcessor +{ + + public static boolean postConstructCalled = false; + + public static boolean preDestroyCalled = true; + + @PostConstruct + public void postConstruct() + { + postConstructCalled = true; + } + + @PreDestroy + public void preDestroy() + { + preDestroyCalled = true; + } + + public void order() + { + + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/OrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.context.RequestScoped; + +@FishStereotype +@RequestScoped +class RedSnapper implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) +@Target( { TYPE }) +@Retention(RUNTIME) +@interface RequestScopedAnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,251 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import java.lang.annotation.Annotation; + +import javax.inject.AnnotationLiteral; +import javax.inject.CreationException; +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.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +@BeansXml("beans.xml") +public class SimpleBeanLifecycleTest extends AbstractDeclarativeTest +{ + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() + { + }; + + @Test(groups = "beanConstruction") + @SpecAssertions({ + @SpecAssertion(section = "3.2.6.3", id = "a"), + @SpecAssertion(section = "2.3.6", id = "d") + }) + public void testInjectionOfParametersIntoBeanConstructor() + { + assert getCurrentManager().resolveByType(FishPond.class).size() == 1; + FishPond fishPond = getCurrentManager().getInstanceByType(FishPond.class); + assert fishPond.goldfish != null; + } + + @Test + @SpecAssertion(section = "3.2.6.3", id = "a") + public void testBindingTypeAnnotatedConstructor() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Duck.class); + assert Duck.constructedCorrectly; + } + }.run(); + } + + @Test(groups = { "specialization" }) + @SpecAssertion(section = "3.2.7", id = "c") + public void testSpecializedBeanAlwaysUsed() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().getInstanceByType(Lion.class, TAME_LITERAL) instanceof MountainLion; + } + + }.run(); + } + + @Test(groups = "beanLifecycle") + @SpecAssertions({ + @SpecAssertion(section = "6.2", id = "a"), + @SpecAssertion(section="2", id="g"), + @SpecAssertion(section="2.2", id="f"), + @SpecAssertion(section="3.2.6", id="a") + }) + public void testCreateReturnsInstanceOfBean() + { + assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; + assert getCurrentManager().getInstanceByType(RedSnapper.class) instanceof RedSnapper; + } + + @Test(groups = { "stub", "beanLifecycle", "interceptors" }) + @SpecAssertion(section = "6.2", id = "b") + public void testCreateBindsInterceptorStack() + { + assert false; + } + + @Test(groups = { "stub", "beanLifecycle", "decorators" }) + @SpecAssertion(section = "6.2", id = "c") + public void testCreateBindsDecoratorStack() + { + assert false; + } + + @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertion(section = "6.4", id = "b") + public void testCreateInjectsEjb() + { + assert false; + } + + @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertion(section = "6.4", id = "c") + public void testCreateInjectsPersistenceContext() + { + assert false; + } + + @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertion(section = "6.4", id = "d") + public void testCreateInjectsResource() + { + assert false; + } + + @Test(groups = "injection") + @SpecAssertion(section = "6.4", id = "e") + public void testCreateInjectsFieldsDeclaredInJava() + { + assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; + TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); + assert tunaFarm.tuna != null; + } + + @Test(groups = { "beanLifecycle", "lifecycleCallbacks" }) + @SpecAssertions({ + @SpecAssertion(section = "6.2", id = "f"), + @SpecAssertion(section = "6.3", id = "b") + }) + public void testPostConstructPreDestroy() throws Exception + { + assert getCurrentManager().resolveByType(Farm.class).size() == 1; + Bean<Farm> farmBean = getCurrentManager().resolveByType(Farm.class).iterator().next(); + Farm farm = getCurrentManager().getInstanceByType(Farm.class); + assert farm.founded != null; + assert farm.initialStaff == 20; + assert farm.closed == null; + farmBean.destroy(farm); + assert farm.closed != null; + } + + @Test + @SpecAssertion(section = "4.2", id = "ba") + public void testSubClassInheritsPostConstructOnSuperclass() throws Exception + { + OrderProcessor.postConstructCalled = false; + assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(CdOrderProcessor.class).order(); + } + }.run(); + assert OrderProcessor.postConstructCalled; + } + + @Test + @SpecAssertion(section = "4.2", id = "bb") + public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception + { + OrderProcessor.preDestroyCalled = false; + assert getCurrentManager().resolveByType(CdOrderProcessor.class).size() == 1; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<CdOrderProcessor> bean = getCurrentManager().resolveByType(CdOrderProcessor.class).iterator().next(); + CdOrderProcessor instance = getCurrentManager().getInstanceByType(CdOrderProcessor.class); + bean.destroy(instance); + } + }.run(); + assert OrderProcessor.preDestroyCalled; + } + + @Test + @SpecAssertion(section = "4.2", id = "ba") + public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception + { + assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1; + OrderProcessor.postConstructCalled = false; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(NovelOrderProcessor.class).order(); + } + }.run(); + assert !OrderProcessor.postConstructCalled; + } + + @Test + @SpecAssertion(section = "4.2", id = "bb") + public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception + { + OrderProcessor.preDestroyCalled = false; + assert getCurrentManager().resolveByType(NovelOrderProcessor.class).size() == 1; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<NovelOrderProcessor> bean = getCurrentManager().resolveByType(NovelOrderProcessor.class).iterator().next(); + NovelOrderProcessor instance = getCurrentManager().getInstanceByType(NovelOrderProcessor.class); + bean.destroy(instance); + } + }.run(); + assert !OrderProcessor.preDestroyCalled; + + } + + @Test(expectedExceptions = CreationException.class) + @SpecAssertion(section = "6.2", id = "h") + public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception + { + assert getCurrentManager().resolveByType(Lorry_Broken.class).size() == 1; + new RunInDependentContext() + { + + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Lorry_Broken.class); + } + + }.run(); + } + + @Test(expectedExceptions = FooException.class) + @SpecAssertion(section = "6.2", id = "g") + public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception + { + assert getCurrentManager().resolveByType(Van_Broken.class).size() == 1; + new RunInDependentContext() + { + + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Van_Broken.class); + } + + }.run(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Synchronous +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Synchronous.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tame.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.context.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Tuna.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +import javax.inject.Current; +import javax.inject.Production; + +@Production +class TunaFarm +{ + + @SuppressWarnings("unused") + @Current + public Tuna tuna; + + public Tuna notInjectedTuna = new Tuna(); + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/TunaFarm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.lifecycle; + +class Van_Broken +{ + + public Van_Broken() throws Exception + { + throw new FooException(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/Van_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml 2009-02-22 13:58:18 UTC (rev 1637) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.simple.lifecycle"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1636 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple: definition and 4 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-22 08:17:56 -0500 (Sun, 22 Feb 2009) New Revision: 1636 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/abstractClass/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java Log: @Artifactify Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java 2009-02-22 10:46:54 UTC (rev 1635) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -2,7 +2,7 @@ import javax.inject.Disposes; -public class DisposingConstructor_Broken +class DisposingConstructor_Broken { public DisposingConstructor_Broken(@Disposes Duck duck) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java 2009-02-22 10:46:54 UTC (rev 1635) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -2,7 +2,7 @@ import javax.event.Observes; -public class ObservingConstructor_Broken +class ObservingConstructor_Broken { public ObservingConstructor_Broken(@Observes String stringEvent) Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-22 10:46:54 UTC (rev 1635) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -1,293 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.simple; - -import java.lang.annotation.Annotation; -import java.util.List; - -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.util.MockCreationalContext; -import org.jboss.jsr299.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken; -import org.jboss.jsr299.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class SimpleBeanDefinitionTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - // *** BEAN CLASS CHECKS ****// - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "ca"), - @SpecAssertion(section = "3.2", id = "ca") - }) - public void testAbstractClassDeclaredInJavaIsNotAllowed() - { - createSimpleBean(Cow_Broken.class); - } - - @Test(groups = "innerClass") - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "cc"), - @SpecAssertion(section = "3.2.1", id = "ba") - }) - public void testStaticInnerClassDeclaredInJavaAllowed() - { - createSimpleBean(StaticInnerBean_Broken.class); - } - - @Test(expectedExceptions = DefinitionException.class, groups = "innerClass") - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "b"), - @SpecAssertion(section = "3.2", id = "a") - }) - public void testNonStaticInnerClassDeclaredInJavaNotAllowed() - { - createSimpleBean(InnerBean_Broken.class); - } - - @SuppressWarnings("unchecked") - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertions({ - @SpecAssertion(section = "3.2.1", id = "a"), - @SpecAssertion(section = "3.2", id = "b") - }) - public void testParameterizedClassDeclaredInJavaIsNotAllowed() - { - createSimpleBean(ParameterizedBean_Broken.class); - } - - @Test - @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "g"), - @SpecAssertion(section = "3.2.1", id = "h"), - @SpecAssertion(section = "3.2.1", id = "i"), - @SpecAssertion(section = "3.2.1", id = "j"), - @SpecAssertion(section = "3.2.1", id = "k")}) - public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() - { - deployBeans(MockFilter.class, MockHttpSessionListener.class, MockServlet.class, MockServletContextListener.class, MockServletRequestListener.class); - assert getCurrentManager().resolveByType(MockFilter.class).size() == 0; - assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServlet.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0; - assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0; - } - - @Test - @SpecAssertion(section="3.2.1", id="l") - public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() - { - deployBeans(MockEnterpriseBean.class); - assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0; - } - - @Test - @SpecAssertion(section="3.2.1", id="m") - public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() - { - deployBeans(MockUIComponent.class); - assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "e") - public void testAbstractClassDeclaredInXmlIsNotAllowed() - { - - } - - @Test(groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "da") - public void testStaticInnerClassDeclaredInXmlAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "d") - public void testNonStaticInnerClassDeclaredInXmlNotAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "c") - public void testParameterizedClassDeclaredInXmlIsNotAllowed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "f") - public void testClassHasInterceptorInJavaMustHaveInterceptorInXml() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) - @SpecAssertion(section = "3.2.4", id = "g") - public void testClassHasDecoratorInJavaMustHaveDecoratorInXml() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.2.6.1", id = "a") - public void testInitializerAnnotatedConstructor() throws Exception - { - deployBeans(Sheep.class); - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Sheep.constructedCorrectly = false; - getCurrentManager().getInstanceByType(Sheep.class); - assert Sheep.constructedCorrectly; - - } - }.run(); - - } - - @Test(groups="broken") - @SpecAssertion(section = "3.2.6.1", id = "b") - public void testImplicitConstructorUsed() - { - deployBeans(Order.class); - Order.constructed = false; - getCurrentManager().getInstanceByType(Order.class); - assert Order.constructed; - } - - @Test - @SpecAssertions({ - @SpecAssertion(section = "3.2.5", id = "a"), - @SpecAssertion(section = "3.2.6.1", id = "b"), - @SpecAssertion(section = "3.1", id = "a"), - @SpecAssertion(section = "3.2.3", id = "a") - }) - public void testEmptyConstructorUsed() - { - Donkey.constructedCorrectly = false; - createSimpleBean(Donkey.class).create(new MockCreationalContext<Donkey>()); - assert Donkey.constructedCorrectly; - } - - @Test - @SpecAssertion(section = "3.2.6.1", id = "a") - public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception - { - deployBeans(Turkey.class); - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Turkey.class); - assert Turkey.constructedCorrectly; - } - }.run(); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.2.6.1", id = "c") - public void testTooManyInitializerAnnotatedConstructor() - { - createSimpleBean(Goose_Broken.class); - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "broken", "disposalMethod" }) - @SpecAssertion(section = "3.2.6.1", id = "d") - public void testConstructorHasDisposesParameter() throws Exception - { - deployBeans(DisposingConstructor_Broken.class, Duck.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(DisposingConstructor_Broken.class); - } - - }.run(); - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "broken", "observerMethod" }) - @SpecAssertion(section = "3.2.6.1", id = "e") - public void testConstructorHasObservesParameter() - { - deployBeans(ObservingConstructor_Broken.class); - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "b") - public void testImplicitConstructorDeclaredInXmlUsed() - { - assert false; - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "b") - public void testEmptyConstructorDeclaredInXmlUsed() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "c") - public void testConstructorDeclaredInXmlDoesNotExist() - { - assert false; - } - - @Test(groups = { "stub", "webbeansxml" }) - @SpecAssertion(section = "3.2.6.2", id = "d") - public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.2", id = "fa") - public void testDependentScopedBeanCanHavePublicField() throws Exception - { - deployBeans(Tiger.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - assert getCurrentManager().getInstanceByType(Tiger.class).name.equals("pete"); - } - - }.run(); - - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.2", id = "fb") - public void testNonDependentScopedBeanCanNotHavePublicField() - { - deployBeans(Leopard_Broken.class); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface ClovenHoved +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ClovenHoved.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Production; + +@Production +abstract class Cow_NotBean +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Cow_NotBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Production; + +@Production +class Donkey +{ + + public static boolean constructedCorrectly = false; + + public Donkey() + { + constructedCorrectly = true; + } + + public Donkey(String foo) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Donkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.ejb.EnterpriseBean; + +class MockEnterpriseBean implements EnterpriseBean +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockEnterpriseBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +class MockFilter implements Filter +{ + + public void destroy() + { + + } + + public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws IOException, ServletException + { + + } + + public void init(FilterConfig arg0) throws ServletException + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.servlet.http.HttpSessionEvent; + +class MockHttpSessionListener implements javax.servlet.http.HttpSessionListener +{ + + public void sessionCreated(HttpSessionEvent arg0) + { + + } + + public void sessionDestroyed(HttpSessionEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockHttpSessionListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,39 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +class MockServlet implements Servlet +{ + + public void destroy() + { + + } + + public ServletConfig getServletConfig() + { + return null; + } + + public String getServletInfo() + { + return null; + } + + public void init(ServletConfig arg0) throws ServletException + { + + } + + public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServlet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +class MockServletContextListener implements ServletContextListener +{ + + public void contextDestroyed(ServletContextEvent arg0) + { + + } + + public void contextInitialized(ServletContextEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletContextListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.servlet.ServletRequestEvent; +import javax.servlet.ServletRequestListener; + +class MockServletRequestListener implements ServletRequestListener +{ + + public void requestDestroyed(ServletRequestEvent arg0) + { + + } + + public void requestInitialized(ServletRequestEvent arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockServletRequestListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,255 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.faces.render.Renderer; + +class MockUIComponent extends UIComponent +{ + + @Override + protected void addFacesListener(FacesListener arg0) + { + + } + + @Override + public void broadcast(FacesEvent arg0) throws AbortProcessingException + { + + } + + @Override + public void decode(FacesContext arg0) + { + + } + + @Override + public void encodeBegin(FacesContext arg0) throws IOException + { + + } + + @Override + public void encodeChildren(FacesContext arg0) throws IOException + { + + } + + @Override + public void encodeEnd(FacesContext arg0) throws IOException + { + + } + + @Override + public UIComponent findComponent(String arg0) + { + return null; + } + + @Override + public Map<String, Object> getAttributes() + { + return null; + } + + @Override + public int getChildCount() + { + return 0; + } + + @Override + public List<UIComponent> getChildren() + { + return null; + } + + @Override + public String getClientId(FacesContext arg0) + { + return null; + } + + @Override + protected FacesContext getFacesContext() + { + return null; + } + + @Override + protected FacesListener[] getFacesListeners(Class arg0) + { + return null; + } + + @Override + public UIComponent getFacet(String arg0) + { + return null; + } + + @Override + public Map<String, UIComponent> getFacets() + { + return null; + } + + @Override + public Iterator<UIComponent> getFacetsAndChildren() + { + return null; + } + + @Override + public String getFamily() + { + return null; + } + + @Override + public String getId() + { + return null; + } + + @Override + public UIComponent getParent() + { + return null; + } + + @Override + protected Renderer getRenderer(FacesContext arg0) + { + return null; + } + + @Override + public String getRendererType() + { + return null; + } + + @Override + public boolean getRendersChildren() + { + return false; + } + + @Override + public ValueBinding getValueBinding(String arg0) + { + return null; + } + + @Override + public boolean isRendered() + { + return false; + } + + @Override + public void processDecodes(FacesContext arg0) + { + + } + + @Override + public void processRestoreState(FacesContext arg0, Object arg1) + { + + } + + @Override + public Object processSaveState(FacesContext arg0) + { + return null; + } + + @Override + public void processUpdates(FacesContext arg0) + { + + } + + @Override + public void processValidators(FacesContext arg0) + { + + } + + @Override + public void queueEvent(FacesEvent arg0) + { + + } + + @Override + protected void removeFacesListener(FacesListener arg0) + { + + } + + @Override + public void setId(String arg0) + { + + } + + @Override + public void setParent(UIComponent arg0) + { + + } + + @Override + public void setRendered(boolean arg0) + { + + } + + @Override + public void setRendererType(String arg0) + { + + } + + @Override + public void setValueBinding(String arg0, ValueBinding arg1) + { + + } + + public boolean isTransient() + { + return false; + } + + public void restoreState(FacesContext arg0, Object arg1) + { + + } + + public Object saveState(FacesContext arg0) + { + return null; + } + + public void setTransient(boolean arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/MockUIComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Production; + +@Production +class Order +{ + + public static boolean constructed = true; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Production; + +class OuterClass +{ + + @Production + class InnerClass_NotBeean + { + + public InnerClass_NotBeean() + { + + } + + } + + static class StaticInnerClass + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/OuterClass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +class ParameterizedClass_NotBean<T> +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/ParameterizedClass_NotBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class Sheep +{ + + public static boolean constructedCorrectly = false; + + @Produces @ClovenHoved + public static String foo = "foo"; + + @Produces @ClovenHoved public static Double bar = 5.5; + + @Initializer + public Sheep(@ClovenHoved String foo, @ClovenHoved Double bar) + { + if (foo.equals(Sheep.foo) && bar.equals(Sheep.bar)) + { + constructedCorrectly = true; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Sheep.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java (from rev 1635, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,235 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +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.unit.implementation.simple.definition.OuterClass.InnerClass_NotBeean; +import org.jboss.jsr299.tck.unit.implementation.simple.definition.OuterClass.StaticInnerClass; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class SimpleBeanDefinitionTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "ca"), + @SpecAssertion(section = "3.2", id = "ca") + }) + public void testAbstractClassDeclaredInJavaNotDiscovered() + { + assert getCurrentManager().resolveByType(Cow_NotBean.class).size() == 0; + } + + @Test(groups = "innerClass") + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "cc"), + @SpecAssertion(section = "3.2.1", id = "ba") + }) + public void testStaticInnerClassDeclaredInJavaAllowed() + { + assert getCurrentManager().resolveByType(StaticInnerClass.class).size() == 1; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "b"), + @SpecAssertion(section = "3.2", id = "a") + }) + public void testNonStaticInnerClassDeclaredInJavaNotDiscovered() + { + assert getCurrentManager().resolveByType(InnerClass_NotBeean.class).size() == 0; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "a"), + @SpecAssertion(section = "3.2", id = "b") + }) + public void testParameterizedClassDeclaredInJavaIsNotDiscovered() + { + assert getCurrentManager().resolveByType(ParameterizedClass_NotBean.class).size() == 0; + } + + @Test + @SpecAssertions( { + @SpecAssertion(section = "3.2.1", id = "g"), + @SpecAssertion(section = "3.2.1", id = "h"), + @SpecAssertion(section = "3.2.1", id = "i"), + @SpecAssertion(section = "3.2.1", id = "j"), + @SpecAssertion(section = "3.2.1", id = "k")}) + public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans() + { + assert getCurrentManager().resolveByType(MockFilter.class).size() == 0; + assert getCurrentManager().resolveByType(MockHttpSessionListener.class).size() == 0; + assert getCurrentManager().resolveByType(MockServlet.class).size() == 0; + assert getCurrentManager().resolveByType(MockServletContextListener.class).size() == 0; + assert getCurrentManager().resolveByType(MockServletRequestListener.class).size() == 0; + } + + @Test + @SpecAssertion(section="3.2.1", id="l") + public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() + { + assert getCurrentManager().resolveByType(MockEnterpriseBean.class).size() == 0; + } + + @Test + @SpecAssertion(section="3.2.1", id="m") + public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean() + { + assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "e") + public void testAbstractClassDeclaredInXmlIsNotAllowed() + { + assert false; + } + + @Test(groups = { "stub", "innerClass", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "da") + public void testStaticInnerClassDeclaredInXmlAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "d") + public void testNonStaticInnerClassDeclaredInXmlNotAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "c") + public void testParameterizedClassDeclaredInXmlIsNotAllowed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "f") + public void testClassHasInterceptorInJavaMustHaveInterceptorInXml() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" }) + @SpecAssertion(section = "3.2.4", id = "g") + public void testClassHasDecoratorInJavaMustHaveDecoratorInXml() + { + assert false; + } + + @Test + @SpecAssertion(section = "3.2.6.1", id = "a") + public void testInitializerAnnotatedConstructor() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Sheep.constructedCorrectly = false; + getCurrentManager().getInstanceByType(Sheep.class); + assert Sheep.constructedCorrectly; + + } + }.run(); + + } + + @Test(groups="broken") + @SpecAssertion(section = "3.2.6.1", id = "b") + public void testImplicitConstructorUsed() + { + Order.constructed = false; + getCurrentManager().getInstanceByType(Order.class); + assert Order.constructed; + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "3.2.5", id = "a"), + @SpecAssertion(section = "3.2.6.1", id = "b"), + @SpecAssertion(section = "3.1", id = "a"), + @SpecAssertion(section = "3.2.3", id = "a") + }) + public void testEmptyConstructorUsed() + { + Donkey.constructedCorrectly = false; + getCurrentManager().getInstanceByType(Donkey.class); + assert Donkey.constructedCorrectly; + } + + @Test + @SpecAssertion(section = "3.2.6.1", id = "a") + public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Turkey.class); + assert Turkey.constructedCorrectly; + } + }.run(); + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "b") + public void testImplicitConstructorDeclaredInXmlUsed() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "b") + public void testEmptyConstructorDeclaredInXmlUsed() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "c") + public void testConstructorDeclaredInXmlDoesNotExist() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "3.2.6.2", id = "d") + public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava() + { + assert false; + } + + @Test + @SpecAssertion(section = "3.2", id = "fa") + public void testDependentScopedBeanCanHavePublicField() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + assert getCurrentManager().getInstanceByType(Tiger.class).name.equals("pete"); + } + + }.run(); + + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.context.Dependent; + +@Dependent +class Tiger +{ + + public String name = "pete"; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Tiger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,31 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition; + +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class Turkey +{ + + @Produces public static String foo = "foo"; + + @Produces static Integer bar = 1; + + public static boolean constructedCorrectly = false; + + public Turkey() + { + + } + + @Initializer + public Turkey(String foo, Integer bar) + { + if (foo.equals(Turkey.foo) && bar.equals(Turkey.bar)) + { + constructedCorrectly = true; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/Turkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; + +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 ConstructorHasDisposesParameterTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "disposalMethod", "underInvestigation" }) + @SpecAssertion(section = "3.2.6.1", id = "d") + public void testConstructorHasDisposesParameter() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; + +import javax.inject.Disposes; + +class DisposingConstructor_Broken +{ + public DisposingConstructor_Broken(@Disposes Duck duck) + { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasDisposesParameter; + + +class Duck +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/Duck.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasObservesParameter; + +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 ConstructorHasObservesParameterTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "underInvestigation", "observerMethod" }) + @SpecAssertion(section = "3.2.6.1", id = "e") + public void testConstructorHasObservesParameter() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.constructorHasObservesParameter; + +import javax.event.Observes; + +class ObservingConstructor_Broken +{ + + public ObservingConstructor_Broken(@Observes String stringEvent) + { + + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.dependentWithPublicField; + +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 DependentWithPublicFieldTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section = "3.2", id = "fb") + public void testNonDependentScopedBeanCanNotHavePublicField() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.dependentWithPublicField; + +import javax.context.RequestScoped; + +@RequestScoped +class Leopard_Broken +{ + + public String name = "pete"; + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/dependentWithPublicField/Leopard_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; + +import javax.inject.Initializer; +import javax.inject.Production; + +@Production +class Goose_Broken +{ + + @Initializer + public Goose_Broken(String foo) + { + } + + @Initializer + public Goose_Broken(String foo, Double bar) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-02-22 13:17:56 UTC (rev 1636) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.simple.definition.tooManyInitializerAnnotatedConstructors; + +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 TooManyInitializerAnnotatedConstructorsTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section = "3.2.6.1", id = "c") + public void testTooManyInitializerAnnotatedConstructor() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1635 - doc/trunk/reference/de-DE.

by webbeans-commits＠lists.jboss.org

Author: jdimanos Date: 2009-02-22 05:46:54 -0500 (Sun, 22 Feb 2009) New Revision: 1635 Modified: doc/trunk/reference/de-DE/producermethods.po Log: update Modified: doc/trunk/reference/de-DE/producermethods.po =================================================================== --- doc/trunk/reference/de-DE/producermethods.po 2009-02-22 05:10:33 UTC (rev 1634) +++ doc/trunk/reference/de-DE/producermethods.po 2009-02-22 10:46:54 UTC (rev 1635) @@ -7,7 +7,7 @@ "Project-Id-Version: producermethods\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-01-10 14:18+0000\n" -"PO-Revision-Date: 2009-01-24 15:33+1100\n" +"PO-Revision-Date: 2009-02-22 21:46+1100\n" "Last-Translator: \n" "Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ #: producermethods.xml:5 #, no-c-format msgid "Producer methods" -msgstr "" +msgstr "Producer-Methoden" #. Tag: para #: producermethods.xml:7 @@ -36,7 +36,7 @@ #: producermethods.xml:12 #, no-c-format msgid "According to the spec:" -msgstr "" +msgstr "Gemäß der Spezifikation:" #. Tag: chapter #: producermethods.xml:12 @@ -90,11 +90,12 @@ #: producermethods.xml:68 #, no-c-format msgid "Scope of a producer method" -msgstr "" +msgstr "Geltungsbereich einer Producer-Methode" #. Tag: para #: producermethods.xml:70 #, no-c-format +#, fuzzy msgid "" "The scope of the producer method defaults to <literal>@Dependent</literal>, " "and so it will be called <emphasis>every time</emphasis> the Web Bean " @@ -102,6 +103,10 @@ "producer method. Thus, there could be multiple instances of the " "<literal>PaymentStrategy</literal> object for each user session." msgstr "" +"Der Geltungsbereich der Producer-Methode ist standardmäßig <literal>@Dependent</literal>, " +"und daher wird sie <emphasis>jedes Mal</emphasis> aufgerufen, wenn der Web Bean " +"Manager eine Einspeisung in dieses oder ein anderes in diese Producer-Methode auflösendes Feld vornimmt. Thus, there could be multiple instances of the " +"<literal>PaymentStrategy</literal> object for each user session." #. Tag: para #: producermethods.xml:75 @@ -109,7 +114,7 @@ msgid "" "To change this behavior, we can add a <literal>@SessionScoped</literal> " "annotation to the method." -msgstr "" +msgstr "Um dieses Verhalten zu ändern, können wir der Methode eine <literal>@SessionScoped</literal>-Annotation hinzufügen." #. Tag: programlisting #: producermethods.xml:78 @@ -132,13 +137,13 @@ "Now, when the producer method is called, the returned " "<literal>PaymentStrategy</literal> will be bound to the session context. The " "producer method won't be called again in the same session." -msgstr "" +msgstr "Wird jetzt die Producer-Methode aufgerufen, so wird die wiedergegebene <literal>PaymentStrategy</literal> an den Session-Kontext gebunden. Die Producer-Methode wird in drselben Session nicht mehr aufgerufen." #. Tag: title #: producermethods.xml:87 #, no-c-format msgid "Injection into producer methods" -msgstr "" +msgstr "Einspeisung in Producer-Methoden" #. Tag: para #: producermethods.xml:89 @@ -150,6 +155,9 @@ "application can't take advantage of dependency injection and don't have " "interceptors." msgstr "" +"Es gibt ein potenzielles Problem mit dem Code oben. Die Implementierungen von " +"<literal>CreditCardPaymentStrategy</literal> werden unter Verwendung des Java " +"<literal>new</literal> Operators instantiiert. Direkt durch die Anwendung instantiierte Objekte können die Dependency-Einspeisung nicht nutzen und besitzen keine Interzeptoren." #. Tag: para #: producermethods.xml:94 @@ -157,7 +165,7 @@ msgid "" "If this isn't what we want we can use dependency injection into the producer " "method to obtain Web Bean instances:" -msgstr "" +msgstr "Falls dies nicht das ist was wir wünschen, so können wir Dependency-Einspeisung in die Producer-Methode verwenden, um Web Bean Instanzen zu erhalten: " #. Tag: programlisting #: producermethods.xml:97 @@ -200,6 +208,8 @@ "emphasis> be detected by the Web Bean manager, so please take extra care " "when returning Web Bean instances from producer methods!" msgstr "" +"Aber Moment mal, was wenn <literal>CreditCardPaymentStrategy</literal> ein anfragenbegrenztes Web Bean ist? Dann hat die Producer-Methode die Wirkung, dass Sie die aktuelle anfragenbegrenzte Instanz in den Geltungsbereich der Session \"befördert\". Das ist mit ziemlicher Sicherheit ein Fehler! Das anfragenbegrenzte Objekt wird vom Web Bean Manager gelöscht ehe die Session endet, aber der Verweis auf das Objekt bleibt im Geltungsbereich der Session \"hängen\" in the session scope. Dieser Fehler wird <emphasis>nicht</" +"emphasis> vom Web Bean Manager aufgespürt, daher seien Sie besonders vorsichtig wenn Sie Web Bean Instanzen von Producer-Methoden wiedergeben!" #. Tag: para #: producermethods.xml:107 @@ -211,6 +221,8 @@ "better option would be to change the scope of the producer method to " "<literal>@Dependent</literal> or <literal>@RequestScoped</literal>." msgstr "" +"Es existieren mindestens drei Arten, wie dieser Fehler behoben werden kann. Wir könnten den Geltungsbereich der <literal>CreditCardPaymentStrategy</literal>-Implementierung ändern, aber das würde auch andere Clients dieses Web Beans betreffen. Eine bessere Option wäre es, den Geltungsbereich der Producer-Methode auf " +"<literal>@Dependent</literal> oder <literal>@RequestScoped</literal> zu ändern." #. Tag: para #: producermethods.xml:113 @@ -218,19 +230,19 @@ msgid "" "But a more common solution is to use the special <literal>@New</literal> " "binding annotation." -msgstr "" +msgstr "Eine gängigere Lösung ist es jedoch, die spezielle <literal>@New</literal> Binding-Annotation zu verwenden." #. Tag: title #: producermethods.xml:119 #, no-c-format msgid "Use of <literal>@New</literal> with producer methods" -msgstr "" +msgstr "Verwendung von <literal>@New</literal> mit Producer-Methoden" #. Tag: para #: producermethods.xml:121 #, no-c-format msgid "Consider the following producer method:" -msgstr "" +msgstr "Sehen Sie sich folgende Producer-Methode an:" #. Tag: programlisting #: producermethods.xml:123 @@ -274,5 +286,5 @@ "session context. The dependent object won't be destroyed until the " "<literal>Preferences</literal> object is destroyed, at the end of the " "session." -msgstr "" +msgstr "Dann wird eine neue <emphasis>abhängige</emphasis> Instanz von <literal>CreditCardPaymentStrategy</literal> erstellt, an die Producer-Methode weitergegeben, von der Producer-Methode wiedergegeben und schließlich an den Session-Kontext gebunden. Das abhängige Objekt wird nicht gelöscht bis das <literal>Preferences</literal>-Objekt gelöscht wird, meist am Ende der Session."

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009