weld-commits February 2009

weld-commits@lists.jboss.org

1 participants
368 discussions

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-21 18:14:10 -0500 (Sat, 21 Feb 2009) New Revision: 1624 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Whitefish.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Beagle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Boxer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Bullmastiff_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Dachshund_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Greyhound_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Husky_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/IrishTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pekingese_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pug_Broken.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: @Artifactify enterprise bean definition tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/DisableIntegrationTestsMethodSelector.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -11,6 +11,8 @@ public class DisableIntegrationTestsMethodSelector implements IMethodSelector { + private static final long serialVersionUID = 6034298835828495024L; + public boolean includeMethod(IMethodSelectorContext context, ITestNGMethod method, boolean isTestMethod) { if (!ConfigurationImpl.get().isRunIntegrationTests() && method.getMethod().getDeclaringClass().isAnnotationPresent(IntegrationTest.class)) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,35 @@ +package org.jboss.jsr299.tck.impl.testng; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.jsr299.tck.impl.ConfigurationImpl; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.testng.IMethodSelector; +import org.testng.IMethodSelectorContext; +import org.testng.ITestNGMethod; + +public class ExcludeIncontainerUnderInvestigationMethodSelector implements IMethodSelector +{ + + private static final long serialVersionUID = 7261618804033064979L; + + public boolean includeMethod(IMethodSelectorContext methodContext, ITestNGMethod method, boolean isTestMethod) + { + if (!ConfigurationImpl.get().isStandalone() || method.getMethod().getDeclaringClass().isAnnotationPresent(IntegrationTest.class)) + { + if (Arrays.asList(method.getGroups()).contains("incontainer-underInvestigation")) + { + methodContext.setStopped(true); + return false; + } + } + return true; + } + + public void setTestMethods(List<ITestNGMethod> arg0) + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Beagle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Beagle_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Beagle_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Stateless; - -@Stateless -@RequestScoped -class Beagle_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Boxer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Boxer_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Boxer_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.ConversationScoped; -import javax.ejb.Stateless; - -@Stateless -@ConversationScoped -class Boxer_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Bullmastiff_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Bullmastiff_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Bullmastiff_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.SessionScoped; -import javax.ejb.Stateless; - -@Stateless -@SessionScoped -class Bullmastiff_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Dachshund_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Dachshund_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Dachshund_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.ApplicationScoped; -import javax.ejb.Stateless; - -@Stateless -@ApplicationScoped -class Dachshund_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,180 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.inject.DefinitionException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.testng.annotations.Test; - -/** - * @author Nicklas Karlsson - * - * Spec version: PRD2 - */ -public class EnterpriseBeanDeclarationTest extends AbstractDeclarativeTest -{ - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "b") - public void testStatelessWithDependentScopeOK() - { - deployBeans(Giraffe.class); - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testStatelessWithRequestScopeFails() - { - deployBeans(Beagle_Broken.class); - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testStatelessWithConversationScopeFails() - { - deployBeans(Boxer_Broken.class); - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testStatelessWithSessionScopeFails() - { - deployBeans(Bullmastiff_Broken.class); - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testStatelessWithApplicationScopeFails() - { - deployBeans(Dachshund_Broken.class); - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "c") - public void testSingletonWithDependentScopeOK() - { - deployBeans(Labrador.class); - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testSingletonWithRequestScopeFails() - { - deployBeans(Greyhound_Broken.class); - assert false; - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testSingletonWithConversationScopeFails() - { - deployBeans(Husky_Broken.class); - assert false; - } - - @Test(groups = { "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "d") - public void testSingletonWithSessionScopeFails() - { - deployBeans(IrishTerrier_Broken.class); - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3", id = "c") - public void testSingletonWithApplicationScopeOK() - { - deployBeans(Laika.class); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "f") - public void testEnterpriseBeanInterceptorFails() - { - deployBeans(Pug_Broken.class); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3", id = "g") - public void testEnterpriseBeanDecoratorFails() - { - deployBeans(Pekingese_Broken.class); - } - - @Test(groups = { "webbeansxml", "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3", id = "e") - public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassNotOK() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBean() - { - // TODO: dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "webbeansxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBeanComplementedWithXML() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "ejbjarxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "b") - public void testEJBJARDefinedEnterpriseBean() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "ejbjarxml", "webbeansxml", "stub" }) - @SpecAssertion(section = "3.3.2", id = "b") - public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() - { - // TODO dupe? - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "a") - public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() - { - assert false; - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "b") - public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInBeanTypes() - { - assert false; - } - - @Test(groups = "enterpriseBeans") - @SpecAssertions({ - @SpecAssertion(section = "3.3.3", id = "c"), - @SpecAssertion(section = "2.2", id = "l") - }) - public void testObjectIsInAPITypes() - { - assert createEnterpriseBean(Laika.class).getTypes().contains(Object.class); - } - - @Test(groups = { "enterpriseBeans", "stub" }) - @SpecAssertion(section = "3.3.3", id = "d") - public void testRemoteInterfacesAreNotInAPITypes() - { - assert false; - } - - @Test(groups = "enterpriseBeans") - @SpecAssertion(section = "3.3.8", id = "a") - public void testDefaultName() - { - assert createEnterpriseBean(Pitbull.class).getName().equals("pitbull"); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Greyhound_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Greyhound_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.RequestScoped; -import javax.ejb.Singleton; - -@Singleton -@RequestScoped -class Greyhound_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Husky_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Husky_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Husky_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.ConversationScoped; - - -//@Singleton -@ConversationScoped -class Husky_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/IrishTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/IrishTerrier_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/IrishTerrier_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.context.SessionScoped; - -//@Singleton -@SessionScoped -class IrishTerrier_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pekingese_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pekingese_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pekingese_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.decorator.Decorator; -import javax.ejb.Stateless; - -@Stateless -@Decorator -class Pekingese_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pug_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pug_Broken.java 2009-02-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pug_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.enterprise; - -import javax.ejb.Stateless; -import javax.interceptor.Interceptor; - -@Stateless -@Interceptor -class Pug_Broken -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java (from rev 1615, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,120 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +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.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +/** + * @author Nicklas Karlsson + * + * Spec version: PRD2 + */ +@Artifact +(a)Packaging(PackagingType.EAR) +public class EnterpriseBeanDefinitionTest extends AbstractDeclarativeTest +{ + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "b") + public void testStatelessWithDependentScopeOK() + { + assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; + } + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "c") + public void testSingletonWithDependentScopeOK() + { + assert getCurrentManager().resolveByType(Labrador.class).size() == 1; + } + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "c") + public void testSingletonWithApplicationScopeOK() + { + assert getCurrentManager().resolveByType(Laika.class).size() == 1; + } + + @Test(groups = { "webbeansxml", "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3", id = "e") + public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassNotOK() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.2", id = "a") + public void testAnnotatedEnterpriseBean() + { + // TODO: dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "webbeansxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "a") + public void testAnnotatedEnterpriseBeanComplementedWithXML() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "ejbjarxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "b") + public void testEJBJARDefinedEnterpriseBean() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "ejbjarxml", "webbeansxml", "stub" }) + @SpecAssertion(section = "3.3.2", id = "b") + public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() + { + // TODO dupe? + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "a") + public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() + { + assert false; + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "b") + public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInBeanTypes() + { + assert false; + } + + @Test(groups = "enterpriseBeans") + @SpecAssertions({ + @SpecAssertion(section = "3.3.3", id = "c"), + @SpecAssertion(section = "2.2", id = "l") + }) + public void testObjectIsInAPITypes() + { + assert getCurrentManager().resolveByType(GiraffeLocal.class).size() == 1; + assert getCurrentManager().resolveByType(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); + } + + @Test(groups = { "enterpriseBeans", "stub" }) + @SpecAssertion(section = "3.3.3", id = "d") + public void testRemoteInterfacesAreNotInAPITypes() + { + assert false; + } + + @Test(groups = "enterpriseBeans") + @SpecAssertion(section = "3.3.8", id = "a") + public void testDefaultName() + { + assert getCurrentManager().resolveByType(PitbullLocal.class).size() == 1; + assert getCurrentManager().resolveByType(PitbullLocal.class).iterator().next().getName().equals("pitbull"); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +import javax.ejb.Stateless; + +@Stateless +class Giraffe implements GiraffeLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Giraffe.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +public interface GiraffeLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/GiraffeLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +import javax.context.Dependent; +import javax.ejb.Singleton; + +@Singleton +@Dependent +class Labrador +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Labrador.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +import javax.context.ApplicationScoped; +import javax.ejb.Remove; +import javax.ejb.Singleton; + +@Singleton +@ApplicationScoped +class Laika +{ + + @Remove + public void remove() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Laika.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +import javax.annotation.Named; +import javax.context.ApplicationScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +@ApplicationScoped +@Named +class Pitbull implements PitbullLocal +{ + + public static boolean destructorCalled = false; + + @Remove + public void bye() + { + destructorCalled = true; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/Pitbull.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition; + +public interface PitbullLocal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/PitbullLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pekingese_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/Pekingese_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessDecorator; + +import javax.decorator.Decorator; +import javax.ejb.Stateless; + +@Stateless +@Decorator +class Pekingese_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessDecorator; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessDecoratorTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertion(section = "3.3", id = "g") + public void testEnterpriseBeanDecoratorFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessDecorator/StatelessDecoratorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pug_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/Pug_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessInterceptor; + +import javax.ejb.Stateless; +import javax.interceptor.Interceptor; + +@Stateless +@Interceptor +class Pug_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.definition.statelessInterceptor; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessInterceptorTest extends AbstractDeclarativeTest +{ + + + @Test + @SpecAssertion(section = "3.3", id = "f") + public void testEnterpriseBeanInterceptorFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/definition/statelessInterceptor/StatelessInterceptorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Husky_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/Husky_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithConversationScope; + +import javax.context.ConversationScoped; + + +//@Singleton +@ConversationScoped +class Husky_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithConversationScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +(a)ExpectedDeploymentException(DefinitionException.class) +@Artifact +(a)Packaging(PackagingType.EAR) +public class SingletonWithConversationScopeTest extends AbstractDeclarativeTest +{ + + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "d") + public void testSingletonWithConversationScopeFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Greyhound_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/Greyhound_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithRequestScope; + +import javax.context.RequestScoped; +import javax.ejb.Singleton; + +@Singleton +@RequestScoped +class Greyhound_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithRequestScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class SingletonWithRequestScopeTest extends AbstractDeclarativeTest +{ + + + @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @SpecAssertion(section = "3.3", id = "d") + public void testSingletonWithRequestScopeFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/IrishTerrier_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/IrishTerrier_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithSessionScope; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.ejb.Singleton; + +@Singleton +@SessionScoped +class IrishTerrier_Broken implements Serializable +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.singletonWithSessionScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class SingletonWithSessionScopeTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @SpecAssertion(section = "3.3", id = "d") + public void testSingletonWithSessionScopeFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Dachshund_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/Dachshund_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithApplicationScope; + +import javax.context.ApplicationScoped; +import javax.ejb.Stateless; + +@Stateless +@ApplicationScoped +class Dachshund_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithApplicationScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessWithApplicationScopeTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "d") + public void testStatelessWithSessionScopeFails() + { + assert false; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Boxer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/Boxer_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithConversationScope; + +import javax.context.ConversationScoped; +import javax.ejb.Stateless; + +@Stateless +@ConversationScoped +class Boxer_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithConversationScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessWithConversationScopeTest extends AbstractDeclarativeTest +{ + + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "d") + public void testStatelessWithConversationScopeFails() + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/Beagle_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithRequestScope; + +import javax.context.RequestScoped; +import javax.ejb.Stateless; + +@Stateless +@RequestScoped +class Beagle_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithRequestScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessWithRequestScopeTest extends AbstractDeclarativeTest +{ + + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "d") + public void testStatelessWithRequestScopeFails() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Bullmastiff_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/Bullmastiff_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithSessionScope; + +import javax.context.SessionScoped; +import javax.ejb.Stateless; + +@Stateless +@SessionScoped +class Bullmastiff_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,27 @@ +package org.jboss.jsr299.tck.unit.implementation.enterprise.statelessWithSessionScope; + +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.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +(a)Packaging(PackagingType.EAR) +public class StatelessWithSessionScopeTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "enterpriseBeans" }) + @SpecAssertion(section = "3.3", id = "d") + public void testStatelessWithSessionScopeFails() + { + assert false; + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -44,7 +44,7 @@ }.run(); } - @Test + @Test(groups="incontainer-underInvestigation") @SpecAssertion(section = "5.4", id = "c") public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Animal.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Animal.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentType.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentType.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/AnotherDeploymentTypeLiteral.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.inject.AnnotationLiteral; + +class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Chunky.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Chunky.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Chunky.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +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 Chunky +{ + + boolean realChunky(); + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Cod.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Cod.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.annotation.Named; +import javax.inject.Production; + + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +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 FakeFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/FakeFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/InstantiationByTypeTest.java (from rev 1613, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/InstantiationByTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/InstantiationByTypeTest.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,75 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.inject.AmbiguousDependencyException; +import javax.inject.AnnotationLiteral; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.TypeLiteral; +import javax.inject.UnsatisfiedDependencyException; + +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.jsr299.BeansXml; +import org.jboss.jsr299.tck.literals.CurrentBinding; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +@BeansXml("beans.xml") +public class InstantiationByTypeTest extends AbstractDeclarativeTest +{ + + @Test(groups={"resolution", "beanLifecycle"}) + @SpecAssertion(section="5.7.2", id = "h") + public void testCurrentBindingTypeAssumed() + { + assert getCurrentManager().getInstanceByType(Tuna.class) != null; + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.7.2", id = "ib") + public void testParameterizedTypeWithWildcardParameter() + { + getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.7.2", id = "ia") + public <T> void testParameterizedTypeWithTypeParameter() + { + getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); + } + + + @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) + @SpecAssertion(section="5.7.2", id = "j") + public void testDuplicateBindingTypesUsed() + { + getCurrentManager().getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding()); + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.7.2", id = "k") + public void testNonBindingTypeUsed() + { + getCurrentManager().getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral()); + } + + @Test(expectedExceptions=AmbiguousDependencyException.class) + @SpecAssertion(section="5.7.2", id = "n") + public void testAmbiguousDependencies() throws Exception + { + getCurrentManager().getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){}); + } + + @Test(expectedExceptions=UnsatisfiedDependencyException.class) + @SpecAssertion(section="5.7.2", id = "m") + public void testUnsatisfiedDependencies() throws Exception + { + getCurrentManager().getInstanceByType(Tuna.class, new AnnotationLiteral<FakeFish>() {}); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ParameterizedBean_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ParameterizedBean_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ParameterizedBean_Broken.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +class ParameterizedBean_Broken<T> +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Salmon.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Salmon.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Salmon.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Named +class Salmon implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ScottishFish.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ScottishFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ScottishFish.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + + + +interface ScottishFish extends Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Sole.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Sole.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Sole.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Whitefish +@Named("whitefish") +class Sole implements ScottishFish +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Tuna.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Tuna.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +import javax.context.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Whitefish.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Whitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/Whitefish.java 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation; + +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 Whitefish +{ + +} Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements (from rev 1615, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements) Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml 2009-02-20 16:09:48 UTC (rev 1615) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml 2009-02-21 23:14:10 UTC (rev 1624) @@ -1,6 +0,0 @@ -<Beans xmlns="urn:java:ee"> - <Deploy> - <Standard /> - <Production /> - </Deploy> -</Beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml (from rev 1623, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/default-beans.xml 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee"> + <Deploy> + <Standard /> + <Production /> + </Deploy> +</Beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml 2009-02-21 23:14:10 UTC (rev 1624) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.typesafe.instantiation"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/beans.xml ___________________________________________________________________ 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-21 22:51:48 UTC (rev 1623) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-21 23:14:10 UTC (rev 1624) @@ -5,6 +5,7 @@ <method-selectors> <method-selector> <selector-class name="org.jboss.jsr299.tck.impl.testng.DisableIntegrationTestsMethodSelector" /> + <selector-class name="org.jboss.jsr299.tck.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> </method-selector> </method-selectors> <groups >

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1623 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-21 17:51:48 -0500 (Sat, 21 Feb 2009) New Revision: 1623 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: chapter 6 assertions Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-21 21:10:30 UTC (rev 1622) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-21 22:51:48 UTC (rev 1623) @@ -3073,9 +3073,495 @@ </section> <section id="6" title="Bean lifecycle"> + <assertion id="a"> + <text>To create a contextual instance of a session bean, the container creates an EJB local object reference</text> + </assertion> + + <assertion id="b"> + <text>To create a contextual instance of a producer method bean, the container calls the producer method</text> + </assertion> + + <assertion id="c"> + <text>To create a contextual instance of a producer field bean, the container retrieves the current value of the field</text> + </assertion> + + <assertion id="d"> + <text>To create a contextual instance of a simple bean, the container calls the bean constructor</text> + </assertion> + + <assertion id="e"> + <text>To destroy a contextual instance of a stateful session bean, the container removes the EJB instance</text> + </assertion> + + <assertion id="f"> + <text>To destroy a contextual instance of a producer method bean, the container calls the disposal method, if any</text> + </assertion> + + <assertion id="g"> + <text>When the container injects a dependency and there is no existing instance of the bean cached by the context object for the bean scope, the context object automatically creates a new contextual instance of the bean</text> + </assertion> + + <assertion id="h"> + <text>When the container resolves an EL name and there is no existing instance of the bean cached by the context object for the bean scope, the context object automatically creates a new contextual instance of the bean</text> + </assertion> + + <assertion id="i"> + <text>When a context is destroyed, the context object automatically destroys any instances associated with that context</text> + </assertion> + + <assertion id="j"> + <text>To create and destroy contextual instances, the context object calls operations defined by the interface Contextual</text> + </assertion> + </section> + <section id="6.1" title="The Contextual interface"> + <assertion id="a"> + <text>The interface javax.context.CreationalContext provides an operation that allows the create() method to register an incompletely initialized contextual instance with the container. A contextual instance is considered incompletely initialized until the create() method returns the instance</text> + </assertion> + + <assertion id="b"> + <text>If Contextual.create() calls CreationalContext.push(), it must also return the instance passed to push()</text> + </assertion> + + <assertion id="c"> + <text>The implementation of Contextual is not required to call CreationalContext.push()</text> + </assertion> </section> + <section id="6.2" title="Creation"> + <assertion id="a"> + <text>The Contextual.create() method obtains an instance of the bean</text> + </assertion> + + <assertion id="b"> + <text>The Contextual.create() method creates the interceptor stacks and binds them to the instance</text> + </assertion> + + <assertion id="c"> + <text>The Contextual.create() method creates the decorator stacks and binds them to the instance</text> + </assertion> + + <assertion id="d"> + <text>The Contextual.create() method injects any dependencies</text> + </assertion> + + <assertion id="e"> + <text>The Contextual.create() method sets any initial field values defined in XML</text> + </assertion> + + <assertion id="f"> + <text>The Contextual.create() method calls the @PostConstruct method, if necessary</text> + </assertion> + + <assertion id="g"> + <text>If any exception occurs while creating an instance, the exception is rethrown by the create() method</text> + </assertion> + + <assertion id="h"> + <text>If a checked exception occurs while creating an instance, it is wrapped and rethrown as an (unchecked) CreationException</text> + </assertion> + </section> + + <section id="6.3" title="Destruction"> + <assertion id="a"> + <text>The Contextual.destroy() method calls the disposal method, if necessary</text> + </assertion> + + <assertion id="b"> + <text>The Contextual.destroy() method calls the @PreDestroy method, if necessary</text> + </assertion> + + <assertion id="c"> + <text>The Contextual.destroy() method destroys all dependent objects of the instance, as defined in Section 8.3.2, "Dependent object destruction"</text> + </assertion> + + <assertion id="d"> + <text>If any exception occurs while destroying an instance, the exception is caught by the destroy() method</text> + </assertion> + + <assertion id="e"> + <text>If the application invokes a contextual instance after it has been destroyed, the behavior is undefined</text> + </assertion> + </section> + + <section id="6.4" title="Lifecycle of simple beans"> + <assertion id="a"> + <text>When the create() method of the Bean object that represents a simple bean is called, the container first calls the bean constructor to obtain an instance of the bean. For each constructor parameter, the container passes the object returned by Manager.getInstanceToInject(). The container is permitted to return an instance of a container-generated subclass of the bean class, allowing interceptor and decorator bindings</text> + </assertion> + + <assertion id="b"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the bean constructor is called the container next initializes the values of any attributes annotated @EJB</text> + </assertion> + + <assertion id="c"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the bean constructor is called the container next initializes the values of any attributes annotated @PersistenceContext</text> + </assertion> + + <assertion id="d"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the bean constructor is called the container next initializes the values of any attributes annotated @Resource</text> + </assertion> + + <assertion id="e"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the @EJB, @PersistenceContext and @Resource attributes are initialized the container initializes the values of all injected fields. For each injected field, the container sets the value to the object returned by Manager.getInstanceToInject().</text> + </assertion> + + <assertion id="f"> + <text>When the create() method of the Bean object that represents a simple bean is called, after injected fields are initialized the container initializes the values of any fields with initial values specified in XML, as defined in Section 9.5.5, "Field initial value declarations".</text> + </assertion> + + <assertion id="g"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the values of fields with initial values specified in XML are initialized the container calls all initializer methods. For each initializer method parameter, the container passes the object +returned by Manager.getInstanceToInject()</text> + </assertion> + + <assertion id="h"> + <text>When the create() method of the Bean object that represents a simple bean is called, after all initializer methods are called the container builds the interceptor stacks for the instance as defined in Section A.3.10 "Interceptor stack creation"</text> + </assertion> + + <assertion id="i"> + <text>When the create() method of the Bean object that represents a simple bean is called, after all initializer methods are called the container builds the decorator stacks for the instance as defined in Section A.5.8 "Decorator stack creation"</text> + </assertion> + + <assertion id="j"> + <text>When the create() method of the Bean object that represents a simple bean is called, after the interceptor and decorator stacks are built the container calls the @PostConstruct method, if any</text> + </assertion> + + <assertion id="k"> + <text>When the destroy() method of a Bean object is called, the container calls the @PreDestroy method, if any</text> + </assertion> + + <assertion id="l"> + <text>When the destroy() method of a Bean object is called, after the container calls the @PreDestroy method, it finally destroys dependent objects</text> + </assertion> + </section> + + <section id="6.5" title="Lifecycle of stateful session beans"> + <assertion id="a"> + <text>When the create() method of a Bean object that represents a stateful session bean that is called, the container creates and returns a session bean proxy, as defined in Section 3.3.9, "Session bean proxies".</text> + </assertion> + + <assertion id="b"> + <text>When the destroy() method of a Bean object is called, the container removes the stateful session bean. The @PreDestroy callback must be invoked by the container</text> + </assertion> + + <assertion id="c"> + <text>If the underlying EJB was already removed by direct invocation of a remove method by the application, the container ignores the instance</text> + </assertion> + </section> + + <section id="6.6" title="Lifecycle of stateless session and singleton beans"> + <assertion id="a"> + <text>When the create() method of a Bean object that represents a stateless session or singleton session bean is called, the container creates and returns a session bean proxy, as defined in Section 3.3.9, "Session bean proxies".</text> + </assertion> + + <assertion id="b"> + <text>When the destroy() method of a Bean object is called, the container simply discards the proxy and all underlying EJB local object references</text> + </assertion> + </section> + + <section id="6.7" title="Lifecycle of producer methods"> + <assertion id="a"> + <text>Any Java object may be returned by a producer method. It is not required that the returned object be an instance of another bean</text> + </assertion> + + <assertion id="b"> + <text>If an object returned by a producer method is not an instance of another bean, the container will not provide injection of other beans</text> + </assertion> + + <assertion id="c"> + <text>If an object returned by a producer method is not an instance of another bean, the container will not provide lifecycle callbacks</text> + </assertion> + + <assertion id="d"> + <text>If an object returned by a producer method is not an instance of another bean, the container will not provide method and lifecycle interception</text> + </assertion> + + <assertion id="e"> + <text>When the create() method of a Bean object that represents a producer method is called, the container must invoke the producer method, passing the object returned by Manager.getInstanceToInject() to each parameter</text> + </assertion> + + <assertion id="f"> + <text>If a producer method is static, the container must invoke the method</text> + </assertion> + + <assertion id="g"> + <text>If a producer method is not static, the container must obtain the Bean object for the most specialized bean that specializes the bean which declares the producer method</text> + </assertion> + + <assertion id="h"> + <text>If a producer method is not static, after obtaining the most specialized Bean object the container must obtain an instance of the most specialized bean, by calling Manager.getInstance(), passing the Bean object representing the bean</text> + </assertion> + + <assertion id="i"> + <text>If a producer method is not static, after obtaining an instance of the most specialized bean the container must invoke the producer method upon this instance</text> + </assertion> + + <assertion id="j"> + <text>The return value of the producer method, after method interception completes, is the new contextual instance to be returned by Bean.create()</text> + </assertion> + + <assertion id="k"> + <text>If the producer method returns a null value and the producer method bean has the scope @Dependent, the create() method returns a null value</text> + </assertion> + + <assertion id="l"> + <text>If the producer method returns a null value, and the scope of the producer method is not @Dependent, the create() method throws an IllegalProductException</text> + </assertion> + + <assertion id="m"> + <text>When the destroy() method is called, and if there is a disposal method for this producer method, the container must invoke the disposal method, passing the instance given to destroy() to the disposed parameter, and the object returned by Manager.getInstanceToInject() to each of the other parameters</text> + </assertion> + + <assertion id="n"> + <text>If a disposal method is static, the container must invoke the method</text> + </assertion> + + <assertion id="o"> + <text>If a disposal method is non-static, the container must obtain the Bean object for the most specialized bean that specializes the bean which declares the disposal method</text> + </assertion> + + <assertion id="p"> + <text>If a disposal method is non-static, after obtaining the Bean object for the most specialized bean, the container must obtain an instance of the most specialized bean, by calling Manager.getInstance(), passing the Bean object representing the bean</text> + </assertion> + + <assertion id="q"> + <text>If a disposal method is non-static, after obtaining the instance of the most specialized bean the container must invoke the disposal method upon this instance</text> + </assertion> + + <assertion id="r"> + <text>Finally, the container destroys dependent objects</text> + </assertion> + </section> + + <section id="6.8" title="Lifecycle of producer fields"> + <assertion id="a"> + <text>Any Java object may be the value of a producer field</text> + </assertion> + + <assertion id="b"> + <text>It is not required that the returned object of a producer field be an instance of another bean</text> + </assertion> + + <assertion id="c"> + <text>If the object returned by a producer field is not an instance of another bean, the container will not provide injection of other beans</text> + </assertion> + + <assertion id="d"> + <text>If the object returned by a producer field is not an instance of another bean, the container will not provide lifecycle callbacks</text> + </assertion> + + <assertion id="e"> + <text>If the object returned by a producer field is not an instance of another bean, the container will not provide method interception</text> + </assertion> + + <assertion id="f"> + <text>If the object returned by a producer field is not an instance of another bean, the container will not provide lifecycle interception</text> + </assertion> + + <assertion id="g"> + <text>When the create() method of a Bean object that represents a producer field is called, the container must access the producer field to obtain the current value of the field</text> + </assertion> + + <assertion id="h"> + <text>If a producer field is static, the container must access the field value</text> + </assertion> + + <assertion id="i"> + <text>If a producer field is non-static, the container must obtain the Bean object for the most specialized bean that specializes the bean which declares the producer field</text> + </assertion> + + <assertion id="j"> + <text>If a producer field is non-static, after obtaining the Bean object for the most specialized bean the container must obtain an instance of the most specialized bean, by calling Manager.getInstance(), passing the Bean object representing the bean</text> + </assertion> + + <assertion id="k"> + <text>If a producer field is non-static, after obtaining an instance of the most specialized bean, the container must access the field value of this instance</text> + </assertion> + + <assertion id="l"> + <text>The value of the producer field is the new contextual instance to be returned by Bean.create()</text> + </assertion> + + <assertion id="m"> + <text>If the producer field contains a null value and the producer field bean has the scope @Dependent, the create() method returns a null value</text> + </assertion> + + <assertion id="n"> + <text>If the producer field contains a null value, and the scope of the producer method is not @Dependent, the create() method throws an IllegalProductException</text> + </assertion> + </section> + + <section id="6.9" title="Lifecycle of resources"> + <assertion id="a" testable="false"> + <text>An instance of a resource is a proxy object, provided by the container, that implements the declared bean type, delegating the actual implementation of the methods directly to the underlying Java EE resource, entity manager, entity manager factory, EJB remote object or web service referenc</text> + </assertion> + + <assertion id="b"> + <text>A resource proxy object is a dependent object of the object it is injected into</text> + </assertion> + + <assertion id="c"> + <text>Resource proxy objects are serializable</text> + </assertion> + + <assertion id="d"> + <text>When the create() method of a Bean object that represents a JMS resource is called, the container creates and returns a proxy object that implements the bean type of the resource</text> + </assertion> + + <assertion id="e"> + <text>The methods of this proxy object delegate to the underlying implementation, which is obtained using the metadata provided in the resource declaration</text> + </assertion> + + <assertion id="f"> + <text>A Java EE resource is obtained using the JNDI name or mapped name specified by <Resource></text> + </assertion> + + <assertion id="g"> + <text>A persistence context is obtained using the persistence unit name specified by <PersistenceContext></text> + </assertion> + + <assertion id="h"> + <text>A persistence unit is obtained using the persistence unit name specified by <PersistenceUnit></text> + </assertion> + + <assertion id="i"> + <text>A remote EJB is obtained using the JNDI name, mapped name or EJB link specified by <EJB></text> + </assertion> + + <assertion id="j"> + <text>A web service is obtained using the JNDI name or mapped name specified by <WebServiceRef></text> + </assertion> + + <assertion id="k"> + <text>When the destroy() method is called, the container discards the proxy object</text> + </assertion> + </section> + + <section id="6.10" title="Lifecycle of JMS resources"> + <assertion id="a" testable="false"> + <text>An instance of a JMS resource is a proxy object, provided by the container, that implements all the bean types defined in Section 3.7, "JMS resources", delegating the actual implementation of these methods directly to the underlying JMS objects</text> + </assertion> + + <assertion id="b"> + <text>A JMS resource proxy object is a dependent object of the object it is injected into</text> + </assertion> + + <assertion id="c"> + <text>JMS resource proxy objects are serializable</text> + </assertion> + + <assertion id="d"> + <text>When the create() method of a Bean object that represents a JMS resource is called, the container creates and returns a proxy object that implements all the bean types of the JMS resource</text> + </assertion> + + <assertion id="e"> + <text>The methods of this proxy object delegate to JMS objects obtained as needed using the metadata provided by the JMS resource declaration and using standard JMS APIs</text> + </assertion> + + <assertion id="f"> + <text>The Destination is obtained using the JNDI name or mapped name specified by <Resource></text> + </assertion> + + <assertion id="g"> + <text>The appropriate ConnectionFactory for the topic or queue is obtained automatically</text> + </assertion> + + <assertion id="h"> + <text>The Connection is obtained by calling QueueConnectionFactory.createQueueConnection() or TopicConnectionFactory.createTopicConnection()</text> + </assertion> + + <assertion id="i" testable="false"> + <text>The container is permitted to share a connection between multiple proxy objects</text> + </assertion> + + <assertion id="j"> + <text>The Session object is obtained by calling QueueConnection.createQueueSession() or TopicConnection.createTopicSession()</text> + </assertion> + + <assertion id="k"> + <text>The MessageProducer object is obtained by calling QueueSession.createSender() or TopicSession.createPublisher()</text> + </assertion> + + <assertion id="l"> + <text>The MessageConsumer object is obtained by calling QueueSession.createReceiver() or TopicSession.createSubscriber()</text> + </assertion> + + <assertion id="m"> + <text>When the destroy() method is called, the container must ensure that all JMS objects created by the proxy object are destroyed by calling close() if necessary</text> + </assertion> + + <assertion id="n"> + <text>The Connection is destroyed by calling Connection.close() if necessary</text> + </assertion> + + <assertion id="o"> + <text>If the connection is being shared between multiple proxy objects, the container is not required to close the connection when the proxy is destroyed</text> + </assertion> + + <assertion id="p"> + <text>The Session object is destroyed by calling Session.close()</text> + </assertion> + + <assertion id="q"> + <text>The MessageProducer object is destroyed by calling MessageProducer.close()</text> + </assertion> + + <assertion id="r"> + <text>The MessageConsumer object is destroyed by calling MessageConsumer.close()</text> + </assertion> + + <assertion id="s"> + <text>The close() method of a JMS resource proxy object always throws an UnsupportedOperationException</text> + </assertion> + + </section> + + <section id="6.11" title="Lifecycle of EJBs"> + <assertion id="a"> + <text>When the EJB container creates a new instance of an EJB, after Java EE injection has been performed and before the @PostConstruct callback occurs the container must initialize the values of all injected fields . For each injected field, the container sets the value to the +object returned by Manager.getInstanceToInject()</text> + </assertion> + + <assertion id="b"> + <text>When the EJB container creates a new instance of an EJB, after Java EE injection has been performed and before the @PostConstruct callback occurs the container must initialize the values of any fields with initial values specified in XML, as defined in Section 9.5.5, "Field initial value declarations"</text> + </assertion> + + <assertion id="c"> + <text>When the EJB container creates a new instance of an EJB, after Java EE injection has been performed and before the @PostConstruct callback occurs the container calls all initializer methods. For each initializer method parameter, the container passes the object returned by Manager.getInstanceToInject()</text> + </assertion> + + <assertion id="d"> + <text>When the EJB container creates a new instance of an EJB, after Java EE injection has been performed and before the @PostConstruct callback occurs the container builds the interceptor stacks for the instance as defined in Section A.3.10, "Interceptor stack creation" and Section A.5.8, "Decorator stack creation" and binds them to the instance</text> + </assertion> + + <assertion id="e"> + <text>When the EJB container creates a new instance of an EJB, after Java EE injection has been performed and before the @PostConstruct callback occurs the container builds the decorator stacks for the instance as defined in Section A.3.10, "Interceptor stack creation" and Section A.5.8, "Decorator stack creation" and binds them to the instance</text> + </assertion> + + <assertion id="f"> + <text>When the EJB container removes an instance of an EJB, the container destroys all dependent objects, after the @PreDestroy callback completes</text> + </assertion> + </section> + + <section id="6.12" title="Lifecycle of servlets"> + <assertion id="a"> + <text>When the servlet container creates a new instance of a servlet, the container initializes the values of all injected fields. For each injected field, the container sets the value to the object returned by Manager.getInstanceToInject()</text> + </assertion> + + <assertion id="b"> + <text>When the servlet container creates a new instance of a servlet, the container calls all initializer methods. For each initializer method parameter, the container passes the object +returned by Manager.getInstanceToInject()</text> + </assertion> + + <assertion id="c"> + <text>When the servlet container destroys a servlet, the container destroys all dependent objects</text> + </assertion> + + <assertion id="d" testable="false"> + <text>In a Java EE 5 environment, the container is not required to support injected fields or initializer methods of servlets</text> + </assertion> + </section> + <section id="7" title="Events"> </section>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1622 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-21 16:10:30 -0500 (Sat, 21 Feb 2009) New Revision: 1622 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/instantiation/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java Log: Convert tests to @Artifact Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Animal.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnimalFarmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class AnimalFarmer extends Farmer<Animal> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentType.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 BindingTypeWithBindingAnnotationMember_Broken -{ - - Expensive expensive(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 BindingTypeWithBindingArrayTypeMember_Broken -{ - - boolean[] bool(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Chunky.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 Chunky -{ - - boolean realChunky(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ChunkyLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Cod.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -class Cod implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DaddyLongLegs.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlyAnimal.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/DeadlySpider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Expensive.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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.annotation.NonBinding; -import javax.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Expensive -{ - - boolean veryExpensive(); - - @NonBinding - int cost(); - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ExpensiveLiteral.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.AnnotationLiteral; - -abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Farmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Production; - -@Production -class Farmer<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/FinalTuna_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,10 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -final class FinalTuna_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Haddock.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Haddock implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Halibut.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -@Expensive(cost=50, veryExpensive=true) -@Whitefish -class Halibut implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,101 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import java.lang.annotation.Annotation; -import java.util.List; - -import javax.inject.AmbiguousDependencyException; -import javax.inject.AnnotationLiteral; -import javax.inject.DuplicateBindingTypeException; -import javax.inject.TypeLiteral; -import javax.inject.UnproxyableDependencyException; -import javax.inject.UnsatisfiedDependencyException; -import javax.inject.manager.Bean; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.literals.CurrentBinding; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class InstantiationByTypeTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - @Test(groups={"resolution", "beanLifecycle"}) - @SpecAssertion(section="5.7.2", id = "h") - public void testCurrentBindingTypeAssumed() - { - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - assert getCurrentManager().getInstanceByType(Tuna.class) != null; - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "ib") - public void testParameterizedTypeWithWildcardParameter() - { - getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "ia") - public <T> void testParameterizedTypeWithTypeParameter() - { - getCurrentManager().getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); - } - - - @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) - @SpecAssertion(section="5.7.2", id = "j") - public void testDuplicateBindingTypesUsed() - { - getCurrentManager().getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding()); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.7.2", id = "k") - public void testNonBindingTypeUsed() - { - getCurrentManager().getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral()); - } - - @Test(expectedExceptions=AmbiguousDependencyException.class) - @SpecAssertion(section="5.7.2", id = "n") - public void testAmbiguousDependencies() throws Exception - { - Bean<Cod> codBean = createSimpleBean(Cod.class); - Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); - Bean<Sole> soleBean = createSimpleBean(Sole.class); - getCurrentManager().addBean(codBean); - getCurrentManager().addBean(salmonBean); - getCurrentManager().addBean(soleBean); - getCurrentManager().getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){}); - } - - @Test(expectedExceptions=UnsatisfiedDependencyException.class) - @SpecAssertion(section="5.7.2", id = "m") - public void testUnsatisfiedDependencies() throws Exception - { - deployBeans(Cod.class, Salmon.class, Sole.class);; - getCurrentManager().getInstanceByType(Tuna.class, new CurrentBinding()); - } - - @Test(expectedExceptions=UnproxyableDependencyException.class) - @SpecAssertion(section="outdated", id = "outdated") - public void testUnproxyableDependencies() throws Exception - { - deployBeans(FinalTuna_Broken.class); - getCurrentManager().getInstanceByType(FinalTuna_Broken.class, new AnnotationLiteral<Whitefish>(){}); - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/LadybirdSpider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ParameterizedBean_Broken.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class ParameterizedBean_Broken<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Plaice.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; - -@AnotherDeploymentType -@Whitefish -@Named("whitefish") -final class Plaice implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/RoundWhitefish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,8 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -@Expensive(cost=60, veryExpensive=true) -@Whitefish -class RoundWhitefish implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Salmon.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Named -class Salmon implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,7 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -interface ScottishFish extends Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ScottishFishFarmer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Production; - -@Production -class ScottishFishFarmer extends Farmer<ScottishFish> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SeaBass.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; -import javax.inject.Production; - -@Production -@RequestScoped -class SeaBass implements Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Sole.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.annotation.Named; -import javax.inject.Production; - -@Production -@Whitefish -@Named("whitefish") -class Sole implements ScottishFish -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Spider.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - - -class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/SpiderProducer.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.inject.Produces; - -@AnotherDeploymentType -class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces public String[] getStrings() - { - return new String[0]; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tarantula.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Tuna.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import javax.context.RequestScoped; - -@AnotherDeploymentType -@RequestScoped -class Tuna -{ - - public String getName() - { - return "Ophir"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java 2009-02-21 20:57:56 UTC (rev 1621) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/Whitefish.java 2009-02-21 21:10:30 UTC (rev 1622) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -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 Whitefish -{ - -}

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1621 - 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-21 15:57:56 -0500 (Sat, 21 Feb 2009) New Revision: 1621 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 createProducerMethod 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-21 20:54:45 UTC (rev 1620) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-21 20:57:56 UTC (rev 1621) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.spi; -import java.lang.reflect.Method; - import javax.inject.manager.Bean; /** @@ -51,26 +49,6 @@ public <T> Bean<T> createEnterpriseBean(Class<T> clazz); /** - * Create a new producer method bean from the given method. The simple or - * enterprise bean on which the method is declared is provided. - * - * The declaringBean is a simple or enterprise bean that has been created by - * calling {@link #createSimpleBean(Class)} or - * {@link #createEnterpriseBean(Class)}. - * - * @param <T> the type of the bean - * @param method the producer method - * @param declaringBean the simple or enterprise bean which declares this - * producer method - * @return the producer 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> createProducerMethodBean(Method method, Bean<?> declaringBean); - - /** * 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-21 20:54:45 UTC (rev 1620) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-21 20:57:56 UTC (rev 1621) @@ -6,7 +6,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.lang.annotation.Annotation; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -81,12 +80,6 @@ { return getCurrentConfiguration().getBeans().createEnterpriseBean(beanClass); } - - @Deprecated - public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean) - { - return getCurrentConfiguration().getBeans().createProducerMethodBean(method, producerBean); - } /** * Used to deploy simple beans in a standalone container.

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1620 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-21 15:54:45 -0500 (Sat, 21 Feb 2009) New Revision: 1620 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java 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/RoundWhitefish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java Log: Convert resolution by type tests to @Artifact Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-21 20:20:44 UTC (rev 1619) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -1,276 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.typesafe; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Set; - -import javax.inject.AnnotationLiteral; -import javax.inject.DefinitionException; -import javax.inject.DuplicateBindingTypeException; -import javax.inject.TypeLiteral; -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.literals.CurrentBinding; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class ResolutionByTypeTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - @Test(groups="resolution") - @SpecAssertions({ - @SpecAssertion(section="5.9", id = "b"), - @SpecAssertion(section="5.9", id = "ga") - }) - public void testDefaultBindingTypeAssumed() throws Exception - { - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - Set<Bean<Tuna>> possibleTargets = getCurrentManager().resolveByType(Tuna.class); - assert possibleTargets.size() == 1; - assert possibleTargets.contains(tunaBean); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.9", id = "cb") - public void testParameterizedTypeWithWildcardParameter() - { - getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.9", id = "ca") - public <T> void testParameterizedTypeWithTypeParameter() - { - getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); - } - - @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) - @SpecAssertion(section="5.9", id = "d") - public void testDuplicateBindingTypesUsed() - { - getCurrentManager().resolveByType(Tuna.class, new CurrentBinding(), new CurrentBinding()); - } - - @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) - @SpecAssertion(section="5.9", id = "e") - public void testNonBindingTypeUsed() - { - getCurrentManager().resolveByType(Tuna.class, new AnotherDeploymentTypeLiteral()); - } - - @Test(groups="resolution") - @SpecAssertion(section="5.9", id = "a") - public void testResolveByType() throws Exception - { - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); - Bean<SeaBass> seaBassBean = createSimpleBean(SeaBass.class); - Bean<Haddock> haddockBean = createSimpleBean(Haddock.class); - - getCurrentManager().addBean(tunaBean); - getCurrentManager().addBean(salmonBean); - getCurrentManager().addBean(haddockBean); - getCurrentManager().addBean(seaBassBean); - - assert getCurrentManager().resolveByType(Tuna.class, new CurrentBinding()).size() == 1; - assert getCurrentManager().resolveByType(Tuna.class, new CurrentBinding()).contains(tunaBean); - - assert getCurrentManager().resolveByType(Tuna.class).size() == 1; - assert getCurrentManager().resolveByType(Tuna.class).contains(tunaBean); - - assert getCurrentManager().resolveByType(Animal.class, new CurrentBinding()).size() == 3; - assert getCurrentManager().resolveByType(Animal.class, new CurrentBinding()).contains(salmonBean); - assert getCurrentManager().resolveByType(Animal.class, new CurrentBinding()).contains(seaBassBean); - assert getCurrentManager().resolveByType(Animal.class, new CurrentBinding()).contains(haddockBean); - } - - @Test(groups="injection") - @SpecAssertions({ - @SpecAssertion(section = "2.3.5", id = "b"), - @SpecAssertion(section = "5.9", id = "gb"), - @SpecAssertion(section = "2.3.3", id = "d") - }) - public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() - { - Bean<Cod> codBean = createSimpleBean(Cod.class); - Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); - Bean<Sole> soleBean = createSimpleBean(Sole.class); - - getCurrentManager().addBean(codBean); - getCurrentManager().addBean(salmonBean); - getCurrentManager().addBean(soleBean); - - assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { - - public boolean realChunky() - { - return true; - } - - }, new AnnotationLiteral<Whitefish>() {}).size() == 1; - assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { - - public boolean realChunky() - { - return true; - } - - }, new AnnotationLiteral<Whitefish>() {}).contains(codBean); - - assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; - assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).contains(codBean); - assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).contains(soleBean); - } - - @Test(groups="resolution") - @SpecAssertions({ - @SpecAssertion(section="5.9", id = "fd"), - @SpecAssertion(section="2.2", id="bb"), - @SpecAssertion(section="2.2", id="ba") - }) - public void testResolveByTypeWithTypeParameter() throws Exception - { - Bean<ScottishFishFarmer> scottishFishFarmerBean = createSimpleBean(ScottishFishFarmer.class); - Bean<AnimalFarmer> farmerBean = createSimpleBean(AnimalFarmer.class); - - getCurrentManager().addBean(scottishFishFarmerBean); - getCurrentManager().addBean(farmerBean); - - assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; - assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).contains(scottishFishFarmerBean); - } - - @Test(groups={"resolution", "producerMethod"}) - @SpecAssertion(section="5.9", id = "fc") - public void testResolveByTypeWithArray() throws Exception - { - Bean<SpiderProducer> spiderProducerBean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(spiderProducerBean); - Method method = SpiderProducer.class.getMethod("getSpiders"); - Bean<Spider[]> spidersModel = createProducerMethodBean(method, spiderProducerBean); - getCurrentManager().addBean(spidersModel); - method = SpiderProducer.class.getMethod("getStrings"); - Bean<String[]> stringModel = createProducerMethodBean(method, spiderProducerBean); - getCurrentManager().addBean(stringModel); - - assert getCurrentManager().resolveByType(Spider[].class).size() == 1; - } - - @Test @SpecAssertion(section="5.9", id = "ha") - public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception - { - Bean<Cod> codBean = createSimpleBean(Cod.class); - Bean<Sole> soleBean = createSimpleBean(Sole.class); - Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class); - - - getCurrentManager().addBean(plaiceBean); - getCurrentManager().addBean(codBean); - getCurrentManager().addBean(soleBean); - - assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; - assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).contains(plaiceBean); - - } - - - @Test(groups="resolution") - @SpecAssertion(section="5.9", id = "hb") - public void testNoWebBeansFound() throws Exception - { - deployBeans(Salmon.class, Sole.class, Plaice.class); - assert getCurrentManager().resolveByType(Tuna.class, new CurrentBinding()).size() == 0; - } - - @Test(groups="resolution") - @SpecAssertions({ - @SpecAssertion(section="5.9.1", id = "b"), - @SpecAssertion(section="5.9", id = "gc"), - @SpecAssertion(section="5.9", id = "gd") - }) - public void testResolveByTypeWithNonBindingMembers() throws Exception - { - Bean<Halibut> halibutBean = createSimpleBean(Halibut.class); - Bean<RoundWhitefish> roundWhiteFishBean = createSimpleBean(RoundWhitefish.class); - Bean<Sole> soleBean = createSimpleBean(Sole.class); - getCurrentManager().addBean(halibutBean); - getCurrentManager().addBean(roundWhiteFishBean); - getCurrentManager().addBean(soleBean); - - Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new ExpensiveLiteral() - { - - public int cost() - { - return 60; - } - - public boolean veryExpensive() - { - return true; - } - - }, new AnnotationLiteral<Whitefish>() {}); - assert beans.size() == 2; - assert beans.contains(halibutBean); - assert beans.contains(roundWhiteFishBean); - } - - @Test(groups="resolution", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="5.9.1", id = "ca") - public void testArrayValuedAnnotationMemberWithoutNonBinding() - { - getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() { - - public boolean[] bool() - { - return new boolean[0]; - } - - }); - } - - @Test(groups="resolution", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="5.9.1", id = "cb") - public void testAnnotationValuedAnnotationMemberWithoutNonBinding() - { - getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken() - { - - public Expensive expensive() - { - return new ExpensiveLiteral() - { - public int cost() - { - return 0; - } - - public boolean veryExpensive() - { - return false; - } - }; - } - - }); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +class AnimalFarmer extends Farmer<Animal> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnimalFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentType.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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/lookup/typesafe/resolution/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.AnnotationLiteral; + +class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/AnotherDeploymentTypeLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.AnnotationLiteral; + +abstract class BindingTypeWithBindingAnnotationMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingAnnotationMember_Broken> implements BindingTypeWithBindingAnnotationMember_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMemberLiteral_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 BindingTypeWithBindingAnnotationMember_Broken +{ + + Expensive expensive(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingAnnotationMember_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.AnnotationLiteral; + +abstract class BindingTypeWithBindingArrayTypeMemberLiteral_Broken extends AnnotationLiteral<BindingTypeWithBindingArrayTypeMember_Broken> implements BindingTypeWithBindingArrayTypeMember_Broken +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMemberLiteral_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 BindingTypeWithBindingArrayTypeMember_Broken +{ + + boolean[] bool(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/BindingTypeWithBindingArrayTypeMember_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 Chunky +{ + + boolean realChunky(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Chunky.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.AnnotationLiteral; + +abstract class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ChunkyLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Cod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +class DaddyLongLegs extends Spider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DaddyLongLegs.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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.annotation.NonBinding; +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Expensive +{ + + boolean veryExpensive(); + + @NonBinding + int cost(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Expensive.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.AnnotationLiteral; + +abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ExpensiveLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 FakeFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FakeFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.Production; + +@Production +class Farmer<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 FishILike +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/FishILike.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Named +@FishILike +class Haddock implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Haddock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + + +@Expensive(cost=50, veryExpensive=true) +@Whitefish +class Halibut implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Halibut.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class LadybirdSpider extends Spider +{ + + public void spinWeb() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/LadybirdSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +class ParameterizedBean_Broken<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ParameterizedBean_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.annotation.Named; + +@AnotherDeploymentType +@Whitefish +@Named("whitefish") +final class Plaice implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Plaice.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java (from rev 1615, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,261 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.inject.AnnotationLiteral; +import javax.inject.DefinitionException; +import javax.inject.DuplicateBindingTypeException; +import javax.inject.TypeLiteral; +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.jboss.jsr299.tck.literals.CurrentBinding; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +@BeansXml("beans.xml") +public class ResolutionByTypeTest extends AbstractDeclarativeTest +{ + + @Test(groups="resolution") + @SpecAssertions({ + @SpecAssertion(section="5.9", id = "b"), + @SpecAssertion(section="5.9", id = "ga") + }) + public void testDefaultBindingTypeAssumed() throws Exception + { + Set<Bean<Tuna>> possibleTargets = getCurrentManager().resolveByType(Tuna.class); + assert possibleTargets.size() == 1; + assert possibleTargets.iterator().next().getTypes().contains(Tuna.class); + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.9", id = "cb") + public void testParameterizedTypeWithWildcardParameter() + { + getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){}); + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.9", id = "ca") + public <T> void testParameterizedTypeWithTypeParameter() + { + getCurrentManager().resolveByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){}); + } + + @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) + @SpecAssertion(section="5.9", id = "d") + public void testDuplicateBindingTypesUsed() + { + getCurrentManager().resolveByType(Tuna.class, new CurrentBinding(), new CurrentBinding()); + } + + @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) + @SpecAssertion(section="5.9", id = "e") + public void testNonBindingTypeUsed() + { + getCurrentManager().resolveByType(Tuna.class, new AnotherDeploymentTypeLiteral()); + } + + @Test(groups="resolution") + @SpecAssertion(section="5.9", id = "a") + public void testResolveByType() throws Exception + { + + assert getCurrentManager().resolveByType(Tuna.class, new CurrentBinding()).size() == 1; + + assert getCurrentManager().resolveByType(Tuna.class).size() == 1; + + Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<FishILike>() {}); + assert beans.size() == 3; + List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); + for (Bean<Animal> bean : beans) + { + if (bean.getTypes().contains(Salmon.class)) + { + classes.add(Salmon.class); + } + else if (bean.getTypes().contains(SeaBass.class)) + { + classes.add(SeaBass.class); + } + else if (bean.getTypes().contains(Haddock.class)) + { + classes.add(Haddock.class); + } + } + assert classes.contains(Salmon.class); + assert classes.contains(SeaBass.class); + assert classes.contains(Haddock.class); + } + + @Test(groups="injection") + @SpecAssertions({ + @SpecAssertion(section = "2.3.5", id = "b"), + @SpecAssertion(section = "5.9", id = "gb"), + @SpecAssertion(section = "2.3.3", id = "d") + }) + public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() + { + assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { + + public boolean realChunky() + { + return true; + } + + }, new AnnotationLiteral<Whitefish>() {}).size() == 1; + assert getCurrentManager().resolveByType(Animal.class, new ChunkyLiteral() { + + public boolean realChunky() + { + return true; + } + + }, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Cod.class); + + assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).size() == 2; + List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); + for (Bean<ScottishFish> bean : getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {})) + { + if (bean.getTypes().contains(Cod.class)) + { + classes.add(Cod.class); + } + else if (bean.getTypes().contains(Sole.class)) + { + classes.add(Sole.class); + } + } + assert classes.contains(Cod.class); + assert classes.contains(Sole.class); + } + + @Test(groups="resolution") + @SpecAssertions({ + @SpecAssertion(section="5.9", id = "fd"), + @SpecAssertion(section="2.2", id="bb"), + @SpecAssertion(section="2.2", id="ba") + }) + public void testResolveByTypeWithTypeParameter() throws Exception + { + assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).size() == 1; + assert getCurrentManager().resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class); + } + + @Test(groups={"resolution", "producerMethod"}) + @SpecAssertion(section="5.9", id = "fc") + public void testResolveByTypeWithArray() throws Exception + { + assert getCurrentManager().resolveByType(Spider[].class).size() == 1; + } + + @Test @SpecAssertion(section="5.9", id = "ha") + public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception + { + assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1; + assert getCurrentManager().resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class); + + } + + + @Test(groups="resolution") + @SpecAssertion(section="5.9", id = "hb") + public void testNoWebBeansFound() throws Exception + { + assert getCurrentManager().resolveByType(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0; + } + + @Test(groups="resolution") + @SpecAssertions({ + @SpecAssertion(section="5.9.1", id = "b"), + @SpecAssertion(section="5.9", id = "gc"), + @SpecAssertion(section="5.9", id = "gd") + }) + public void testResolveByTypeWithNonBindingMembers() throws Exception + { + + Set<Bean<Animal>> beans = getCurrentManager().resolveByType(Animal.class, new ExpensiveLiteral() + { + + public int cost() + { + return 60; + } + + public boolean veryExpensive() + { + return true; + } + + }, new AnnotationLiteral<Whitefish>() {}); + assert beans.size() == 2; + + List<Class<? extends Animal>> classes = new ArrayList<Class<? extends Animal>>(); + for (Bean<Animal> bean : beans) + { + if (bean.getTypes().contains(Halibut.class)) + { + classes.add(Halibut.class); + } + else if (bean.getTypes().contains(RoundWhitefish.class)) + { + classes.add(RoundWhitefish.class); + } + } + assert classes.contains(Halibut.class); + assert classes.contains(RoundWhitefish.class); + } + + @Test(groups="resolution", expectedExceptions=DefinitionException.class) + @SpecAssertion(section="5.9.1", id = "ca") + public void testArrayValuedAnnotationMemberWithoutNonBinding() + { + getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() { + + public boolean[] bool() + { + return new boolean[0]; + } + + }); + } + + @Test(groups="resolution", expectedExceptions=DefinitionException.class) + @SpecAssertion(section="5.9.1", id = "cb") + public void testAnnotationValuedAnnotationMemberWithoutNonBinding() + { + getCurrentManager().resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken() + { + + public Expensive expensive() + { + return new ExpensiveLiteral() + { + public int cost() + { + return 0; + } + + public boolean veryExpensive() + { + return false; + } + }; + } + + }); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/RoundWhitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/RoundWhitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/RoundWhitefish.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +@Expensive(cost=60, veryExpensive=true) +@Whitefish +class RoundWhitefish implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/RoundWhitefish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Named +@FishILike +class Salmon implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Salmon.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + + +interface ScottishFish extends Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.Production; + +@Production +class ScottishFishFarmer extends Farmer<ScottishFish> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ScottishFishFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.context.RequestScoped; +import javax.inject.Production; + +@Production +@RequestScoped +@FishILike +class SeaBass implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SeaBass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.annotation.Named; +import javax.inject.Production; + +@Production +@Whitefish +@Named("whitefish") +class Sole implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Sole.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + + +class Spider implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + + @Produces public Spider[] getSpiders() + { + return ALL_SPIDERS; + } + + @Produces public String[] getStrings() + { + return new String[0]; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Tuna.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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/lookup/typesafe/resolution/Tuna.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.lookup.typesafe.resolution; + +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 Whitefish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/Whitefish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml 2009-02-21 20:54:45 UTC (rev 1620) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.typesafe.resolution"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1619 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two and 5 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-21 15:20:44 -0500 (Sat, 21 Feb 2009) New Revision: 1619 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml Removed: 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 tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Covert injection tests to @Artifact, minor fix for a couple of specialization tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -3,13 +3,14 @@ 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 @ExpectedDeploymentException(DefinitionException.class) -public class SpecializingBeanExtendsEnterpriseBeanTest +public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractDeclarativeTest { @Test(groups = { "specialization" }) @SpecAssertion(section = "3.2.7", id = "a") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -3,13 +3,14 @@ import javax.inject.InconsistentSpecializationException; 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 @ExpectedDeploymentException(InconsistentSpecializationException.class) -public class TwoSpecializingBeansForOneSpecializedTest +public class TwoSpecializingBeansForOneSpecializedTest extends AbstractDeclarativeTest { @Test @SpecAssertion(section="4.3.3", id="a") Deleted: 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 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; - -class BeanWithFinalBoundField_Broken -{ - - @Current - public final Tuna tuna = null; - -} Deleted: 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 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; - -class BeanWithStaticBoundField_Broken -{ - - @Current - public static Tuna tuna; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Produces; - -class FarmHouseProducer_Broken -{ - - @Produces public Integer getNumberOfBedrooms() - { - return null; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -1,11 +0,0 @@ -package org.jboss.jsr299.tck.unit.lookup.injection; - -import javax.inject.Current; - -class FarmHouse_Broken -{ - - @Current - public int noOfBedrooms; - -} 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-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -1,16 +1,12 @@ package org.jboss.jsr299.tck.unit.lookup.injection; -import java.lang.annotation.Annotation; -import java.util.List; - import javax.context.ContextNotActiveException; import javax.inject.DefinitionException; -import javax.inject.NullableDependencyException; -import javax.inject.manager.Bean; import org.hibernate.tck.annotations.SpecAssertion; 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.jsr299.BeansXml; import org.testng.annotations.Test; /** @@ -18,45 +14,27 @@ * Spec version: PRD2 * */ +@Artifact +@BeansXml("beans.xml") public class InjectionTest extends AbstractDeclarativeTest { - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } @Test(groups = { "injection", "producerMethod" }) @SpecAssertion(section = "5.2", id = "aa") public void testInjectionPerformsBoxingIfNecessary() throws Exception { - Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(spiderProducer); - Bean<SpiderNest> spiderNestBean = createSimpleBean(SpiderNest.class); - getCurrentManager().addBean(createProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer)); - SpiderNest spiderNest = spiderNestBean.create(new MockCreationalContext<SpiderNest>()); + assert getCurrentManager().resolveByType(SpiderNest.class).size() == 1; + SpiderNest spiderNest = getCurrentManager().getInstanceByType(SpiderNest.class); assert spiderNest.numberOfSpiders != null; assert spiderNest.numberOfSpiders.equals(4); } - @Test(groups = { "injection", "producerMethod" }, expectedExceptions = NullableDependencyException.class) - @SpecAssertion(section = "5.2", id = "a") - public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception - { - deployBeans(FarmHouseProducer_Broken.class, FarmHouse_Broken.class); - } - @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class) @SpecAssertion(section = "5.3", id = "a") public void testInvokeNormalInjectedWebBeanWhenContextNotActive() { - Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>()); + assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1; + TunaFarm tunaFarm = getCurrentManager().getInstanceByType(TunaFarm.class); assert tunaFarm.tuna != null; getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); tunaFarm.tuna.getName(); @@ -66,37 +44,14 @@ @SpecAssertion(section = "5.3", id = "b") public void testInvokeDependentScopeWhenContextNotActive() { - Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); - Bean<Fox> foxBean = createSimpleBean(Fox.class); - getCurrentManager().addBean(foxBean); - FoxRun foxRun = foxRunBean.create(new MockCreationalContext<FoxRun>()); + assert getCurrentManager().resolveByType(FoxRun.class).size() == 1; + FoxRun foxRun = getCurrentManager().getInstanceByType(FoxRun.class); assert foxRun.fox.getName().equals("gavin"); } - - @Test(groups = "injection", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "outdated", id = "outdated") - public void testInjectingStaticField() - { - Bean<BeanWithStaticBoundField_Broken> bean = createSimpleBean(BeanWithStaticBoundField_Broken.class); - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - bean.create(new MockCreationalContext<BeanWithStaticBoundField_Broken>()); - } - - @Test(groups = "injection", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "outdated", id = "outdated") - public void testInjectingFinalField() - { - Bean<BeanWithFinalBoundField_Broken> bean = createSimpleBean(BeanWithFinalBoundField_Broken.class); - Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); - getCurrentManager().addBean(tunaBean); - bean.create(new MockCreationalContext<BeanWithFinalBoundField_Broken>()); - } @Test @SpecAssertion(section="4.2", id = "a") public void testFieldDeclaredInSuperclassInjected() throws Exception { - deployBeans(Fox.class, DeluxeHenHouse.class, HenHouse.class); new RunInDependentContext() { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouseProducer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouseProducer_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; + +import javax.inject.Produces; + +class FarmHouseProducer_Broken +{ + + @Produces public Integer getNumberOfBedrooms() + { + return null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/FarmHouse_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/FarmHouse_Broken.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; + +import javax.inject.Current; + +class FarmHouse_Broken +{ + + @Current + public int noOfBedrooms; + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java 2009-02-21 20:20:44 UTC (rev 1619) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.lookup.injection.nullableBean; + +import javax.inject.NullableDependencyException; + +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(NullableDependencyException.class) +public class NullableBeanTest extends AbstractDeclarativeTest +{ + + + @Test(groups = { "injection", "producerMethod" }) + @SpecAssertion(section = "5.2", id = "a") + public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/nullableBean/NullableBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml 2009-02-21 20:20:44 UTC (rev 1619) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.lookup.injection"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/lookup/injection/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-21 12:55:15 UTC (rev 1618) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-21 20:20:44 UTC (rev 1619) @@ -1935,8 +1935,15 @@ <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> + + + <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> </assertion> <assertion id="c">

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1618 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/producer/method and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-21 07:55:15 -0500 (Sat, 21 Feb 2009) New Revision: 1618 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.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/producer/method/lifecycle/Request.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FooException.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/InfertileChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Lorry.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LorryProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Ship.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ShipProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/WolfSpider.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java Log: Convert producer method lifecucle tests to @Artifact Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -15,7 +15,7 @@ @Retention(RUNTIME) @Documented @DeploymentType -public @interface AnotherDeploymentType +@interface AnotherDeploymentType { } \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.Specializes; - -@Specializes -@AnotherDeploymentType -class AndalusianChicken extends Chicken -{ - private static Egg egg = new Egg(); - - @Override - public Egg getEgg() - { - return egg; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Animal.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Animal.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnimalStereotype.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnimalStereotype.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import static java.lang.annotation.ElementType.FIELD; -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.Retention; -import java.lang.annotation.Target; - -import javax.annotation.Stereotype; -import javax.context.RequestScoped; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnotherDeploymentType.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnotherDeploymentType.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -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 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BeanWithStaticProducerMethod.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.Produces; -import javax.inject.Production; - -@Production -class BeanWithStaticProducerMethod -{ - - @Produces public static String getString() - { - return "Pete"; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BlackWidow.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/BlackWidow.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.Produces; - -class Chicken -{ - private static Egg egg = new Egg(); - - @Produces - public Egg produceEgg() - { - return getEgg(); - } - - public Egg getEgg() - { - return egg; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DaddyLongLegs.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DaddyLongLegs.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlyAnimal.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlyAnimal.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlySpider.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlySpider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DefangedTarantula.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DefangedTarantula.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class DefangedTarantula extends Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,231 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.DefinitionException; -import javax.inject.UnsatisfiedDependencyException; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.testng.annotations.Test; - -/** - * - * Spec version: Public Release Draft 2 - * - */ -public class DisposalMethodDefinitionTest -{ - - /** - * A disposal method must be a method of a simple bean class or session bean - * class. - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertions({ - @SpecAssertion(section = "3.4.6", id = "a"), - @SpecAssertion(section = "3.4.6", id = "c"), - @SpecAssertion(section = "3.4.6", id = "e") - }) - public void testDisposalMethodCanBeOfSimpleOrSessionBean() - { - assert false; - } - - /** - * A disposal method may be either static or non-static - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.6", id = "b") - public void testDisposalMethodCanBeStaticOrNonStatic() - { - assert false; - } - - /** - * A bean may declare multiple disposal methods - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.6", id = "d") - public void testBeanCanDeclareMultipleDisposalMethods() - { - assert false; - } - - /** - * Each disposal method must have exactly one disposed parameter, of the same - * type as the corresponding producer method return type - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.7", id = "a") - public void testDisposalMethodCanHaveOnlyOneDisposedParameter() - { - assert false; - } - - /** - * When searching for disposal methods for a producer method, the container - * considers the type and bindings of the disposed parameter. - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.7", id = "b") - public void testContainerUsesTypeAndBindingsForDisposalMethodSearch() - { - assert false; - } - - /** - * If a disposed parameter resolves to a producer method according to the - * typesafe resolution algorithm, the container must call this method when - * destroying an instance returned by that producer method. - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.7", id = "d") - public void testContainerCallsDisposalMethodOnDestructionOfProducedInstance() - { - assert false; - } - - /** - * If the disposed parameter does not resolve to any producer method - * according to the typesafe resolution algorithm, an - * UnsatisfiedDependencyException is thrown by the container at deployment - * time - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { UnsatisfiedDependencyException.class }) - @SpecAssertion(section = "3.4.7", id = "c") - public void testDisposalMethodOnUnresolvableTypeFails() - { - assert false; - } - - /** - * A disposal method may be declared using annotations by annotating a - * parameter @javax.inject.Disposes. That parameter is the disposed parameter - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.8", id = "a") - public void testDisposalMethodDeclaredByAnnotation() - { - assert false; - } - - /** - * If a method has more than one parameter annotated @Disposes, a - * DefinitionException is thrown by the container - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.8", id = "b") - public void testMoreThanOneDisposalParameterFails() - { - assert false; - } - - /** - * If a disposal method is annotated @Produces, or @Initializer or has a - * parameter annotated @Observes, a DefinitionException is thrown by the - * container at deployment time - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.8", id = "c") - public void testDisposalMethodWithProducesFails() - { - assert false; - } - - /** - * If a disposal method is annotated @Produces, or @Initializer or has a - * parameter annotated @Observes, a DefinitionException is thrown by the - * container at deployment time - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.8", id = "d") - public void testDisposalMethodWithInitializerFails() - { - assert false; - } - - /** - * If a disposal method is annotated @Produces, or @Initializer or has a - * parameter annotated @Observes, a DefinitionException is thrown by the - * container at deployment time - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.8", id = "e") - public void testDisposalMethodWithObservesFails() - { - assert false; - } - - /** - * For a bean defined in XML, a disposal method may be declared using the - * method name, the <Disposes> element, and the parameter types of the - * method - */ - @Test(groups = { "stub", "disposalMethod", "webbeansxml" }) - @SpecAssertion(section = "3.4.9", id = "a") - public void testDisposalMethodDeclaredByXML() - { - assert false; - } - - /** - * When a disposal method is declared in XML, the container ignores binding - * annotations applied to the Java method parameter - */ - @Test(groups = { "stub", "disposalMethod", "webbeansxml" }) - @SpecAssertion(section = "3.4.9", id = "b") - public void testDisposalMethodDeclaredByXMLIgnoresAnnotatedBindings() - { - assert false; - } - - /** - * If the bean class of a bean declared in XML does not have a method with - * the name and parameter types declared in XML, a DefinitionException is - * thrown by the container at deployment time - */ - @Test(groups = { "stub", "disposalMethod", "webbeansxml" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.9", id = "c") - public void testDisposalMethodDeclaredByXMLDoesNotMatchJava() - { - assert false; - } - - /** - * In addition to the disposed parameter, a disposal method may declare - * additional parameters, which may also specify bindings. The container - * calls Manager.getInstanceToInject() to determine a value for each - * parameter of a disposal method and calls the disposal method with those - * parameter values - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.10", id = "a") - public void testDisposalMethodParametersGetInjected() - { - assert false; - } - - /** - * When searching for disposal methods for a producer method, the container - * searches for disposal methods which are declared by an enabled bean, and - * for which the disposed parameter must resolve to the producer method, - * according to the typesafe resolution algorithm - */ - @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.11", id = "a") - public void testDisposalMethodTypeSafeResolution() - { - assert false; - } - - /** - * If there are multiple disposal methods for a producer method, a - * DefinitionException is thrown by the container at deployment time - */ - @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) - @SpecAssertion(section = "3.4.11", id = "b") - public void testMultipleDisposalMethodsFails() - { - assert false; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Egg.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Egg.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class Egg -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FooException.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FooException.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FooException.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class FooException extends RuntimeException -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FunnelWeaver.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FunnelWeaver.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class FunnelWeaver<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/InfertileChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/InfertileChicken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/InfertileChicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class InfertileChicken extends Chicken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LadybirdSpider.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LadybirdSpider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.context.ApplicationScoped; - -@ApplicationScoped -class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Lorry.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Lorry.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Lorry.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class Lorry -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LorryProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LorryProducer_Broken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LorryProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.Produces; - -class LorryProducer_Broken -{ - - @Produces - public Lorry produceLorry() throws Exception - { - throw new Exception(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,143 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.List; - -import javax.inject.CreationException; -import javax.inject.IllegalProductException; -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 ProducerMethodLifecycleTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - - @Test(groups = { "producerMethod", "broken" }) - @SpecAssertions({ - @SpecAssertion(section = "3.4", id = "c"), - @SpecAssertion(section = "3.4", id = "k"), - @SpecAssertion(section = "3.4.2", id = "a") - }) - public void testProducerMethodBeanCreate() throws Exception - { - Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer); - Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>()); - assert tarantula != null; - } - - /** - * Otherwise, if the producer method is non-static, the container must: - * - * • obtain the Bean object for the most specialized bean that specializes - * the bean which declares the producer method, and then - * - * • obtain an instance of the most specialized bean, by calling - * Manager.getInstance(), passing the Bean object representing the bean, and - * - * • invoke the producer method upon this instance. - * - * @throws Exception - */ - @Test(groups = { "specialization" }) - @SpecAssertion(section = "6.7", id = "unknown") - public void testSpecializedBeanAlwaysUsed() throws Exception - { - deployBeans(Chicken.class, AndalusianChicken.class); - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Egg egg = getCurrentManager().getInstanceByType(Egg.class); - assert egg != null; - assert egg.equals(new AndalusianChicken().getEgg()); - } - - }.run(); - } - - @Test(groups = { "stub", "disposalMethod", "beanLifecycle" }) - @SpecAssertion(section = "6.7", id = "unknown") - public void testDisposalMethodCalled() - { - // TODO Placeholder - assert false; - } - - @Test(groups = { "producerMethod", "broken" }) - @SpecAssertions( { @SpecAssertion(section = "3.4", id = "e"), @SpecAssertion(section = "B.1", id = "unknown"), @SpecAssertion(section = "7.3", id = "unknown") }) - public void testProducerMethodReturnsNullIsDependent() throws Exception - { - Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("getNullSpider"); - Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); - Spider spider = spiderBean.create(new MockCreationalContext<Spider>()); - assert spider == null; - } - - @Test(groups = "producerMethod", expectedExceptions = IllegalProductException.class) - @SpecAssertions( { @SpecAssertion(section = "3.4", id = "f"), @SpecAssertion(section = "B.1", id = "unknown") }) - public void testProducerMethodReturnsNullIsNotDependent() throws Exception - { - Bean<SpiderProducer_Broken> spiderProducer = createSimpleBean(SpiderProducer_Broken.class); - getCurrentManager().addBean(spiderProducer); - Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider"); - createProducerMethodBean(method, spiderProducer).create(new MockCreationalContext<Object>()); - } - - @Test(expectedExceptions = CreationException.class) - @SpecAssertion(section="6.7", id="unknown") - public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception - { - deployBeans(LorryProducer_Broken.class); - new RunInDependentContext() - { - - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Lorry.class); - } - - }.run(); - } - - @Test(expectedExceptions = FooException.class) - @SpecAssertion(section="6.7", id="unknown") - public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception - { - deployBeans(ShipProducer_Broken.class); - new RunInDependentContext() - { - - protected void execute() throws Exception - { - getCurrentManager().getInstanceByType(Ship.class); - } - - }.run(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Ship.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Ship.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Ship.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class Ship -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ShipProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ShipProducer_Broken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ShipProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,14 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.inject.Produces; - -class ShipProducer_Broken -{ - - @Produces - public Ship produceShip() throws FooException - { - throw new FooException(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Spider.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Spider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - - -class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,74 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.annotation.Named; -import javax.context.RequestScoped; -import javax.inject.Produces; -import javax.inject.Production; - -@AnotherDeploymentType -class SpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - - @Produces public Tarantula produceTarantula() - { - return new Tarantula(); - } - - @Produces public Spider getNullSpider() - { - return null; - } - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() - { - return new FunnelWeaver<Spider>(); - } - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver() - { - return new FunnelWeaver<Object>(); - } - - @Produces public Animal makeASpider() - { - return new WolfSpider(); - } - - @Produces public int getWolfSpiderSize() - { - return 4; - } - - @Produces public Spider[] getSpiders() - { - return ALL_SPIDERS; - } - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs() - { - return new DaddyLongLegs(); - } - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider() - { - return new LadybirdSpider(); - } - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider() - { - return new WolfSpider(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,41 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import javax.context.RequestScoped; -import javax.event.Observes; -import javax.inject.Disposes; -import javax.inject.Produces; -import javax.inject.Production; - -@Production -class SpiderProducer_Broken -{ - - @Produces @RequestScoped public Spider getRequestScopedSpider() - { - return null; - } - - @Produces - public String destroy() - { - return "foo"; - } - - @Produces - public String dispose(@Disposes String foo) - { - return "foo"; - } - - @Produces - public String observe(@Observes String foo) - { - return "foo"; - } - - @Produces @AnimalStereotype public Integer produceInteger() - { - return 1; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tame.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tame.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -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 -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tarantula.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tarantula.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/WolfSpider.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/WolfSpider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -class WolfSpider implements Animal -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java (from rev 1615, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/disposal/definition/DisposalMethodDefinitionTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,231 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.disposal.definition; + +import javax.inject.DefinitionException; +import javax.inject.UnsatisfiedDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.testng.annotations.Test; + +/** + * + * Spec version: Public Release Draft 2 + * + */ +public class DisposalMethodDefinitionTest +{ + + /** + * A disposal method must be a method of a simple bean class or session bean + * class. + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertions({ + @SpecAssertion(section = "3.4.6", id = "a"), + @SpecAssertion(section = "3.4.6", id = "c"), + @SpecAssertion(section = "3.4.6", id = "e") + }) + public void testDisposalMethodCanBeOfSimpleOrSessionBean() + { + assert false; + } + + /** + * A disposal method may be either static or non-static + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.6", id = "b") + public void testDisposalMethodCanBeStaticOrNonStatic() + { + assert false; + } + + /** + * A bean may declare multiple disposal methods + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.6", id = "d") + public void testBeanCanDeclareMultipleDisposalMethods() + { + assert false; + } + + /** + * Each disposal method must have exactly one disposed parameter, of the same + * type as the corresponding producer method return type + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.7", id = "a") + public void testDisposalMethodCanHaveOnlyOneDisposedParameter() + { + assert false; + } + + /** + * When searching for disposal methods for a producer method, the container + * considers the type and bindings of the disposed parameter. + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.7", id = "b") + public void testContainerUsesTypeAndBindingsForDisposalMethodSearch() + { + assert false; + } + + /** + * If a disposed parameter resolves to a producer method according to the + * typesafe resolution algorithm, the container must call this method when + * destroying an instance returned by that producer method. + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.7", id = "d") + public void testContainerCallsDisposalMethodOnDestructionOfProducedInstance() + { + assert false; + } + + /** + * If the disposed parameter does not resolve to any producer method + * according to the typesafe resolution algorithm, an + * UnsatisfiedDependencyException is thrown by the container at deployment + * time + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { UnsatisfiedDependencyException.class }) + @SpecAssertion(section = "3.4.7", id = "c") + public void testDisposalMethodOnUnresolvableTypeFails() + { + assert false; + } + + /** + * A disposal method may be declared using annotations by annotating a + * parameter @javax.inject.Disposes. That parameter is the disposed parameter + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.8", id = "a") + public void testDisposalMethodDeclaredByAnnotation() + { + assert false; + } + + /** + * If a method has more than one parameter annotated @Disposes, a + * DefinitionException is thrown by the container + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.8", id = "b") + public void testMoreThanOneDisposalParameterFails() + { + assert false; + } + + /** + * If a disposal method is annotated @Produces, or @Initializer or has a + * parameter annotated @Observes, a DefinitionException is thrown by the + * container at deployment time + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.8", id = "c") + public void testDisposalMethodWithProducesFails() + { + assert false; + } + + /** + * If a disposal method is annotated @Produces, or @Initializer or has a + * parameter annotated @Observes, a DefinitionException is thrown by the + * container at deployment time + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.8", id = "d") + public void testDisposalMethodWithInitializerFails() + { + assert false; + } + + /** + * If a disposal method is annotated @Produces, or @Initializer or has a + * parameter annotated @Observes, a DefinitionException is thrown by the + * container at deployment time + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.8", id = "e") + public void testDisposalMethodWithObservesFails() + { + assert false; + } + + /** + * For a bean defined in XML, a disposal method may be declared using the + * method name, the <Disposes> element, and the parameter types of the + * method + */ + @Test(groups = { "stub", "disposalMethod", "webbeansxml" }) + @SpecAssertion(section = "3.4.9", id = "a") + public void testDisposalMethodDeclaredByXML() + { + assert false; + } + + /** + * When a disposal method is declared in XML, the container ignores binding + * annotations applied to the Java method parameter + */ + @Test(groups = { "stub", "disposalMethod", "webbeansxml" }) + @SpecAssertion(section = "3.4.9", id = "b") + public void testDisposalMethodDeclaredByXMLIgnoresAnnotatedBindings() + { + assert false; + } + + /** + * If the bean class of a bean declared in XML does not have a method with + * the name and parameter types declared in XML, a DefinitionException is + * thrown by the container at deployment time + */ + @Test(groups = { "stub", "disposalMethod", "webbeansxml" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.9", id = "c") + public void testDisposalMethodDeclaredByXMLDoesNotMatchJava() + { + assert false; + } + + /** + * In addition to the disposed parameter, a disposal method may declare + * additional parameters, which may also specify bindings. The container + * calls Manager.getInstanceToInject() to determine a value for each + * parameter of a disposal method and calls the disposal method with those + * parameter values + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.10", id = "a") + public void testDisposalMethodParametersGetInjected() + { + assert false; + } + + /** + * When searching for disposal methods for a producer method, the container + * searches for disposal methods which are declared by an enabled bean, and + * for which the disposed parameter must resolve to the producer method, + * according to the typesafe resolution algorithm + */ + @Test(groups = { "stub", "disposalMethod" }) + @SpecAssertion(section = "3.4.11", id = "a") + public void testDisposalMethodTypeSafeResolution() + { + assert false; + } + + /** + * If there are multiple disposal methods for a producer method, a + * DefinitionException is thrown by the container at deployment time + */ + @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class }) + @SpecAssertion(section = "3.4.11", id = "b") + public void testMultipleDisposalMethodsFails() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AndalusianChicken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AndalusianChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AndalusianChicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class AndalusianChicken extends Chicken +{ + public static Egg egg = new Egg(); + + @Override + public Egg getEgg() + { + return egg; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AndalusianChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Animal.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Animal.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AnotherDeploymentType.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/AnotherDeploymentType.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Chicken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Chicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Chicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.inject.Produces; + +@PoultryFarmDeploymentType +class Chicken +{ + private static Egg egg = new Egg(); + + @Produces + public Egg produceEgg() + { + return getEgg(); + } + + public Egg getEgg() + { + return egg; + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlyAnimal.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlyAnimal.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlySpider.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/DeadlySpider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Egg.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Egg.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Egg.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class Egg +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/FooException.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class FooException extends RuntimeException +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/FooException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/InfertileChicken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/InfertileChicken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/InfertileChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/InfertileChicken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class InfertileChicken extends Chicken +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Lorry.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class Lorry +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Lorry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/LorryProducer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.inject.Produces; + +@AnotherDeploymentType +class LorryProducer_Broken +{ + + @Produces + public Lorry produceLorry() throws Exception + { + throw new Exception(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/LorryProducer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 Null +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Null.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 PoultryFarmDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/PoultryFarmDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java (from rev 1615, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,129 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.context.CreationalContext; +import javax.inject.AnnotationLiteral; +import javax.inject.CreationException; +import javax.inject.IllegalProductException; +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 ProducerMethodLifecycleTest extends AbstractDeclarativeTest +{ + + @Test(groups = { "producerMethod", "broken" }) + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "c"), + @SpecAssertion(section = "3.4", id = "k"), + @SpecAssertion(section = "3.4.2", id = "a") + }) + public void testProducerMethodBeanCreate() throws Exception + { + assert getCurrentManager().getInstanceByType(Tarantula.class) != null; + } + + /** + * Otherwise, if the producer method is non-static, the container must: + * + * • obtain the Bean object for the most specialized bean that specializes + * the bean which declares the producer method, and then + * + * • obtain an instance of the most specialized bean, by calling + * Manager.getInstance(), passing the Bean object representing the bean, and + * + * • invoke the producer method upon this instance. + * + * @throws Exception + */ + @Test(groups = { "specialization" }) + @SpecAssertion(section = "6.7", id = "unknown") + public void testSpecializedBeanAlwaysUsed() throws Exception + { + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Egg egg = getCurrentManager().getInstanceByType(Egg.class); + assert egg != null; + assert egg.equals(AndalusianChicken.egg); + } + + }.run(); + } + + @Test(groups = { "stub", "disposalMethod", "beanLifecycle" }) + @SpecAssertion(section = "6.7", id = "unknown") + public void testDisposalMethodCalled() + { + // TODO Placeholder + assert false; + } + + @Test(groups = { "producerMethod", "broken" }) + @SpecAssertions( { @SpecAssertion(section = "3.4", id = "e"), @SpecAssertion(section = "B.1", id = "unknown"), @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") }) + public void testProducerMethodReturnsNullIsNotDependent() throws Exception + { + assert getCurrentManager().resolveByType(Spider.class, new AnnotationLiteral<Request>() {}).size() == 1; + Bean<Spider> spider = getCurrentManager().resolveByType(Spider.class, new AnnotationLiteral<Request>() {}).iterator().next(); + // Do the create ourselves, otherwise we may get a proxy back... + spider.create(new CreationalContext<Spider>() { + + public void push(Spider incompleteInstance) + { + // TODO Auto-generated method stub + + }}); + } + + @Test(expectedExceptions = CreationException.class) + @SpecAssertion(section="6.7", id="unknown") + public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception + { + new RunInDependentContext() + { + + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Lorry.class); + } + + }.run(); + } + + @Test(expectedExceptions = FooException.class) + @SpecAssertion(section="6.7", id="unknown") + public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception + { + new RunInDependentContext() + { + + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(Ship.class); + } + + }.run(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Request.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Request.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Request.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 Request +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Request.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Ship.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class Ship +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Ship.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ShipProducer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.inject.Produces; + +@AnotherDeploymentType +class ShipProducer_Broken +{ + + @Produces + public Ship produceShip() throws FooException + { + throw new FooException(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ShipProducer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Spider.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Spider.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + + +class Spider implements Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer.java (from rev 1616, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } + + @Produces @Null public Spider getNullSpider() + { + return null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/SpiderProducer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +import javax.context.RequestScoped; +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer_Broken +{ + + @Produces @RequestScoped @Request public Spider getRequestScopedSpider() + { + return null; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tame.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tame.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tarantula.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/Tarantula.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.inheritance.specialization.simple.broken.extendejb; + +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/inheritance/specialization/simple/broken/extendejb/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -15,6 +15,7 @@ @SpecAssertion(section = "3.2.7", id = "a") public void testSpecializingClassDirectlyExtendsEnterpriseBean() { + assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -2,8 +2,6 @@ import javax.inject.Specializes; -import org.jboss.jsr299.tck.unit.implementation.producer.field.AnotherDeploymentType; - @Specializes @AnotherDeploymentType class Tractor_Broken extends FarmEquipment Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/FishFarmer_Broken.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -2,8 +2,6 @@ import javax.inject.Specializes; -import org.jboss.jsr299.tck.unit.implementation.producer.field.AnotherDeploymentType; - @Specializes @AnotherDeploymentType class FishFarmer_Broken extends Farmer Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-21 12:10:43 UTC (rev 1617) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-02-21 12:55:15 UTC (rev 1618) @@ -15,6 +15,7 @@ @SpecAssertion(section="4.3.3", id="a") public void testTwoBeansSpecializeTheSameBean() { + assert false; } } Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml 2009-02-21 12:55:15 UTC (rev 1618) @@ -0,0 +1,9 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.method.lifecycle"> + <Deploy> + <Standard /> + <Production /> + <test:PoultryFarmDeploymentType /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1616 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector and 18 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-20 14:30:00 -0500 (Fri, 20 Feb 2009) New Revision: 1616 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BeanWithStaticProducerMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/LadybirdSpider.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/definition/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tame.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/WolfSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Proxies.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 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 tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java Log: convert producer method tests to @Artifact (one broken) and fix a bug in the RI reflection layer Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -158,8 +158,7 @@ */ protected void initTypes() { - types = new HashSet<Type>(); - Reflections.getTypeHierachy(getType(), types); + types = new Reflections.HierarchyDiscovery<Type>(getAnnotatedItem().getUnderlyingType()).getFlattenedTypes(); } /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -116,10 +116,7 @@ { try { - if (getAnnotatedItem() != null) - { - this.type = getAnnotatedItem().getType(); - } + this.type = getAnnotatedItem().getType(); } catch (ClassCastException e) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -126,6 +126,8 @@ * @return The type of the element */ public Class<T> getType(); + + public Type getUnderlyingType(); /** * Extends Java Class assignability such that actual type parameters are also Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -118,6 +118,11 @@ { return delegate().getType(); } + + public Type getUnderlyingType() + { + return delegate().getUnderlyingType(); + } /** * @see org.jboss.webbeans.introspector.AnnotatedItem Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -18,6 +18,7 @@ package org.jboss.webbeans.introspector.jlr; import java.lang.annotation.Annotation; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Set; @@ -52,8 +53,11 @@ } + public Type getUnderlyingType() + { + return getType(); + } - // Cached string representation private String toString; private final AnnotationStore annotationStore; @@ -166,9 +170,16 @@ return true; } } - else + else if (type instanceof ParameterizedType) { - + ParameterizedType parameterizedType = (ParameterizedType) type; + if (parameterizedType.getRawType() instanceof Class) + { + if (isAssignableFrom((Class<?>) parameterizedType.getRawType(), parameterizedType.getActualTypeArguments())) + { + return true; + } + } } } return false; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -48,6 +48,8 @@ // The actual type arguments private final Type[] actualTypeArguments; + private final Type underlyingType; + private final Class<T> type; // The underlying method private final Method method; @@ -87,12 +89,15 @@ this.method = method; this.method.setAccessible(true); this.declaringClass = declaringClass; + this.type = (Class<T>) method.getReturnType(); if (method.getGenericReturnType() instanceof ParameterizedType) { - this.actualTypeArguments = ((ParameterizedType) method.getGenericReturnType()).getActualTypeArguments(); + this.underlyingType = method.getGenericReturnType(); + this.actualTypeArguments = ((ParameterizedType) underlyingType).getActualTypeArguments(); } else { + this.underlyingType = type; this.actualTypeArguments = new Type[0]; } @@ -132,58 +137,33 @@ } } - /** - * Gets the annotated method - * - * @return The method - */ public Method getAnnotatedMethod() { return method; } - /** - * Gets the delegate - * - * @return The delegate - */ public Method getDelegate() { return method; } - /** - * Gets the type of the method - * - * @return The return type of the method - */ @SuppressWarnings("unchecked") public Class<T> getType() { - return (Class<T>) method.getReturnType(); + return type; } + + @Override + public Type getUnderlyingType() + { + return underlyingType; + } - /** - * Gets the actual type arguments - * - * @return The actual type arguments - * - * @see org.jboss.webbeans.introspector.AnnotatedMethod#getActualTypeArguments() - */ public Type[] getActualTypeArguments() { return actualTypeArguments; } - /** - * Gets the annotated parameters - * - * If the parameters are null, they are initialized first - * - * @return The annotated parameters - * - * @see org.jboss.webbeans.introspector.AnnotatedMethod#getParameters() - */ public List<AnnotatedParameter<?>> getParameters() { return Collections.unmodifiableList(parameters); @@ -194,25 +174,11 @@ return method.getParameterTypes(); } - /** - * Gets the parameter abstractions with a given annotation type - * - * If the parameter abstractions are null, they are initialized first - * - * @param annotationType The annotation type to match - * @return The list of abstracted parameters with given annotation type - * present. An empty list is returned if there are no matches - */ public List<AnnotatedParameter<?>> getAnnotatedParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableList(annotatedParameters.get(annotationType)); } - /** - * Compares two annotated methods (delegates) - * - * @return True if equals, false otherwise - */ @Override public boolean equals(Object other) { @@ -252,35 +218,16 @@ return result; } - /** - * Gets the name of the property - * - * @return The name - * - * @see org.jboss.webbeans.introspector.AnnotatedMethod#getPropertyName() - */ public String getPropertyName() { return propertyName; } - /** - * Gets the declaring class - * - * @return The declaring class - * - * @see org.jboss.webbeans.introspector.AnnotatedMethod#getDeclaringClass() - */ public AnnotatedType<?> getDeclaringClass() { return declaringClass; } - /** - * Gets a string representation of the method - * - * @return A string representation - */ @Override public String toString() { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Proxies.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Proxies.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Proxies.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -16,6 +16,7 @@ */ package org.jboss.webbeans.util; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Iterator; import java.util.LinkedHashSet; @@ -142,7 +143,23 @@ */ public static boolean isTypeProxyable(Type type) { - Class<?> clazz = (Class<?>) type; + if (type instanceof Class) + { + return isClassProxyable((Class<?>) type); + } + else if (type instanceof ParameterizedType) + { + Type rawType = ((ParameterizedType) type).getRawType(); + if (rawType instanceof Class) + { + return isClassProxyable((Class<?>) rawType); + } + } + return false; + } + + private static boolean isClassProxyable(Class<?> clazz) + { if (clazz.isInterface()) { return true; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -43,6 +43,66 @@ */ public class Reflections { + + public static class HierarchyDiscovery<T extends Type> + { + + private final T type; + + private Set<T> types; + + public HierarchyDiscovery(T type) + { + this.type = type; + } + + protected void add(T type) + { + types.add(type); + } + + public Set<T> getFlattenedTypes() + { + if (types == null) + { + this.types = new HashSet<T>(); + discoverTypes(type); + } + return types; + } + + + private void discoverTypes(T type) + { + if (type != null) + { + add(type); + if (type instanceof Class) + { + discoverFromClass((Class<?>) type); + } + else if (type instanceof ParameterizedType) + { + Type rawType = ((ParameterizedType) type).getRawType(); + if (rawType instanceof Class) + { + discoverFromClass((Class<?>) rawType); + } + } + } + } + + @SuppressWarnings("unchecked") + private void discoverFromClass(Class<?> clazz) + { + discoverTypes((T) clazz.getSuperclass()); + for (Class<?> c : clazz.getInterfaces()) + { + discoverTypes((T) c); + } + } + + } /** * Gets the property name from a getter method @@ -336,38 +396,19 @@ * reached. For each steps, adds all interfaces of the class to the set. * Since the data structure is a set, duplications are eliminated * + * + * @deprecated see {@link HierarchyDiscovery} * @param clazz The class to examine * @return The set of classes and interfaces in the hierarchy * @see #getTypeHierachy(Class, Set) */ + @Deprecated public static Set<Class<?>> getTypeHierachy(Class<?> clazz) { - Set<Class<?>> classes = new HashSet<Class<?>>(); - getTypeHierachy(clazz, classes); - return classes; + return new HierarchyDiscovery<Class<?>>(clazz).getFlattenedTypes(); } /** - * Gets the flattened type hierarchy for a class, including all super classes - * and the entire interface type hierarchy - * - * @param clazz the class to examine - * @param classes the set of types - */ - public static void getTypeHierachy(Class<?> clazz, Set<? super Class<?>> classes) - { - if (clazz != null) - { - classes.add(clazz); - getTypeHierachy(clazz.getSuperclass(), classes); - for (Class<?> c : clazz.getInterfaces()) - { - getTypeHierachy(c, classes); - } - } - } - - /** * Checks the bindingType to make sure the annotation was declared properly * as a binding type (annotated with @BindingType). * Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java (from rev 1612, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,90 @@ +package org.jboss.webbeans.test.examples; + +import java.util.Arrays; + +import javax.inject.Production; +import javax.inject.Standard; + +import org.jboss.webbeans.test.unit.AbstractTest; +import org.testng.annotations.Test; + +public class ExampleTest extends AbstractTest +{ + @Test + public void testGameGenerator() throws Exception { + setupGameGenerator(); + + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Game game1 = manager.getInstanceByType(Game.class); + Game game2 = manager.getInstanceByType(Game.class); + assert game1!=game2; + assert game1.getNumber()!=game2.getNumber(); + Generator gen1 = manager.getInstanceByType(Generator.class); + Generator gen2 = manager.getInstanceByType(Generator.class); + assert gen1.getRandom()!=null; + assert gen1.getRandom()==gen2.getRandom(); + } + + }.run(); + } + + private void setupGameGenerator() throws NoSuchMethodException + { + deployBeans(Game.class, Generator.class); + } + + @Test + public void testMockSentenceTranslator() throws Exception { + + manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, Mock.class)); + setupTextTranslator(); + + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + TextTranslator tt2 = manager.getInstanceByType(TextTranslator.class); + assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); + } + + }.run(); + } + + @Test + public void testSentenceTranslator() throws Exception { + setupTextTranslator(); + + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + TextTranslator tt1 = manager.getInstanceByType(TextTranslator.class); + try + { + tt1.translate("hello world"); + assert false; + } + catch (UnsupportedOperationException uoe) + { + //expected + } + } + + }.run(); + } + + private void setupTextTranslator() + { + deployBeans(SentenceParser.class, SentenceTranslator.class, MockSentenceTranslator.class, TextTranslator.class); + } + +} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-02-20 16:09:48 UTC (rev 1615) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -1,90 +0,0 @@ -package org.jboss.webbeans.test.examples; - -import java.util.Arrays; - -import javax.inject.Production; -import javax.inject.Standard; - -import org.jboss.webbeans.test.unit.AbstractTest; -import org.testng.annotations.Test; - -public class Tests extends AbstractTest -{ - @Test - public void testGameGenerator() throws Exception { - setupGameGenerator(); - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Game game1 = manager.getInstanceByType(Game.class); - Game game2 = manager.getInstanceByType(Game.class); - assert game1!=game2; - assert game1.getNumber()!=game2.getNumber(); - Generator gen1 = manager.getInstanceByType(Generator.class); - Generator gen2 = manager.getInstanceByType(Generator.class); - assert gen1.getRandom()!=null; - assert gen1.getRandom()==gen2.getRandom(); - } - - }.run(); - } - - private void setupGameGenerator() throws NoSuchMethodException - { - deployBeans(Game.class, Generator.class); - } - - @Test - public void testMockSentenceTranslator() throws Exception { - - manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, Mock.class)); - setupTextTranslator(); - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - TextTranslator tt2 = manager.getInstanceByType(TextTranslator.class); - assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); - } - - }.run(); - } - - @Test - public void testSentenceTranslator() throws Exception { - setupTextTranslator(); - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - TextTranslator tt1 = manager.getInstanceByType(TextTranslator.class); - try - { - tt1.translate("hello world"); - assert false; - } - catch (UnsupportedOperationException uoe) - { - //expected - } - } - - }.run(); - } - - private void setupTextTranslator() - { - deployBeans(SentenceParser.class, SentenceTranslator.class, MockSentenceTranslator.class, TextTranslator.class); - } - -} 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-20 16:09:48 UTC (rev 1615) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.spi; -import java.lang.reflect.Field; import java.lang.reflect.Method; import javax.inject.manager.Bean; @@ -104,20 +103,6 @@ */ public boolean isEntityBean(Class<?> clazz); - /** - * Create a new producer field bean from the given method. - * - * @param <T> The type of the bean - * @param field the producer field - * @param declaringBean - * @return the producer 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> createProducerFieldBean(Field field, Bean<?> declaringBean); - public boolean isProxy(Object instance); } 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-20 16:09:48 UTC (rev 1615) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -6,7 +6,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.lang.annotation.Annotation; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -88,13 +87,7 @@ { return getCurrentConfiguration().getBeans().createProducerMethodBean(method, producerBean); } - - @Deprecated - public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean) - { - return getCurrentConfiguration().getBeans().createProducerFieldBean(field, producerBean); - } - + /** * Used to deploy simple beans in a standalone container. * Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -1,286 +0,0 @@ -package org.jboss.jsr299.tck.unit.implementation.producer.method; - -import java.lang.reflect.Method; - -import javax.context.RequestScoped; -import javax.inject.Current; -import javax.inject.DefinitionException; -import javax.inject.Production; -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.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class ProducerMethodDefinitionTest extends AbstractDeclarativeTest -{ - - @Test(groups = "producerMethod") - @SpecAssertion(section = "2.5.3", id = "g") - public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); - tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "b") - public void testStaticMethod() throws Exception - { - Bean<BeanWithStaticProducerMethod> bean = createSimpleBean(BeanWithStaticProducerMethod.class); - getCurrentManager().addBean(bean); - Method method = BeanWithStaticProducerMethod.class.getMethod("getString"); - createProducerMethodBean(method, bean); - } - - @Test(groups = { "stub", "producerMethod", "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4", id = "d") - public void testProducerMethodIsNotBusinessMethod() throws Exception - { - assert false; - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4", id = "g") - public void testParameterizedReturnType() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider"); - createProducerMethodBean(method, bean); - } - - @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4", id = "h") - public void testParameterizedReturnTypeWithWildcard() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver"); - createProducerMethodBean(method, bean); - } - - @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4", id = "i") - public void testParameterizedReturnTypeWithTypeParameter() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getFunnelWeaver"); - createProducerMethodBean(method, bean); - } - - @Test(groups = "producerMethod") - @SpecAssertions( { @SpecAssertion(section = "3.4", id = "b"), - @SpecAssertion(section = "2.3.1", id = "a") }) - public void testDefaultBindingType() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); - } - - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4.1", id = "c"), - @SpecAssertion(section="2.2", id = "l") - }) - public void testApiTypeForClassReturn() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); - assert tarantulaModel.getTypes().size() == 6; - assert tarantulaModel.getTypes().contains(Tarantula.class); - assert tarantulaModel.getTypes().contains(DeadlySpider.class); - assert tarantulaModel.getTypes().contains(Spider.class); - assert tarantulaModel.getTypes().contains(Animal.class); - assert tarantulaModel.getTypes().contains(DeadlyAnimal.class); - assert tarantulaModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.1", id = "a") - public void testApiTypeForInterfaceReturn() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Animal> animalModel = createProducerMethodBean(method, bean); - assert animalModel.getTypes().size() == 2; - assert animalModel.getTypes().contains(Animal.class); - assert animalModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.1", id = "b") - public void testApiTypeForPrimitiveReturn() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> intModel = createProducerMethodBean(method, bean); - assert intModel.getTypes().size() == 2; - assert intModel.getTypes().contains(int.class); - assert intModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerMethod") - @SpecAssertions( { @SpecAssertion(section = "3.4.1", id = "b"), - @SpecAssertion(section = "2.2", id = "j") }) - public void testApiTypeForArrayTypeReturn() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getSpiders"); - Bean<Spider[]> spidersModel = createProducerMethodBean(method, bean); - assert spidersModel.getTypes().size() == 2; - assert spidersModel.getTypes().contains(Spider[].class); - assert spidersModel.getTypes().contains(Object.class); - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "be") - public void testBindingType() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); - } - - @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "ba") - public void testScopeType() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsModel = createProducerMethodBean(method, bean); - assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); - - // TODO Inherit scope from returned web bean? - } - - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bc"), - @SpecAssertion(section = "2.5.3", id = "b") - }) - public void testDeploymentType() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("getLadybirdSpider"); - Bean<LadybirdSpider> ladybirdSpiderModel = createProducerMethodBean(method, bean); - assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); - } - - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bb"), - @SpecAssertion(section = "2.6.1", id = "b") - }) - public void testNamedMethod() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(method, bean); - assert blackWidowSpiderModel.getName().equals("blackWidow"); - } - - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4.2", id = "bb"), - @SpecAssertion(section = "2.6.1", id = "d"), - @SpecAssertion(section = "2.4.12", id = "a") - }) - public void testDefaultNamedMethod() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerMethodBean(method, bean); - assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); - } - - @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4.2", id = "d") - public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception - { - Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer_Broken.class.getMethod("dispose", String.class); - createProducerMethodBean(method, bean); - } - - @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4.2", id = "e") - public void testProducerMethodWithParameterAnnotatedObserves() throws Exception - { - Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer_Broken.class.getMethod("observe", String.class); - createProducerMethodBean(method, bean); - } - - // Review 2.2 - @Test(groups = "producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "b"), - @SpecAssertion(section = "3.4.2", id = "ba"), - @SpecAssertion(section = "2.4.5", id = "c"), - @SpecAssertion(section = "3.4.2", id = "bd") - }) - public void testStereotypeSpecifiesScope() throws Exception - { - Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer.class.getMethod("produceWolfSpider"); - Bean<WolfSpider> wolfSpider = createProducerMethodBean(method, bean); - // assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() - // == 1; - // assert - // wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); - assert wolfSpider.getScopeType().equals(RequestScoped.class); - } - - @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "b"), - @SpecAssertion(section = "3.4.2", id = "bc"), - @SpecAssertion(section = "2.7.4", id = "b") - }) - public void testStereotypeEnforcesTypes() throws Exception - { - Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); - getCurrentManager().addBean(bean); - Method method = SpiderProducer_Broken.class.getMethod("produceInteger"); - createProducerMethodBean(method, bean); - } - - @Test - @SpecAssertion(section = "4.2", id = "d") - public void testNonStaticProducerMethodNotInherited() - { - deployBeans(InfertileChicken.class); - assert getCurrentManager().resolveByType(Egg.class).size() == 0; - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java 2009-02-20 16:09:48 UTC (rev 1615) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/SpiderProducer.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -35,12 +35,7 @@ { return new FunnelWeaver<Object>(); } - - @Produces public <T> FunnelWeaver<T> getFunnelWeaver() - { - return new FunnelWeaver<T>(); - } - + @Produces public Animal makeASpider() { return new WolfSpider(); Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import javax.inject.Specializes; + +@Specializes +@AnotherDeploymentType +class AndalusianChicken extends Chicken +{ + private static Egg egg = new Egg(); + + @Override + public Egg getEgg() + { + return egg; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Animal.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +interface Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnimalStereotype.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +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.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AnotherDeploymentType.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +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 +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BeanWithStaticProducerMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BeanWithStaticProducerMethod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BeanWithStaticProducerMethod.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class BeanWithStaticProducerMethod +{ + + @Produces public static String getString() + { + return "Pete"; + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +public interface Bite +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Bite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/BlackWidow.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class BlackWidow extends Spider implements DeadlySpider +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import javax.inject.Produces; + +class Chicken +{ + private static Egg egg = new Egg(); + + @Produces @Yummy + public Egg produceEgg() + { + return getEgg(); + } + + public Egg getEgg() + { + return egg; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DaddyLongLegs.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DaddyLongLegs.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class DaddyLongLegs extends Spider +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlyAnimal.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +interface DeadlyAnimal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DeadlySpider.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/DefangedTarantula.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class DefangedTarantula extends Tarantula +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class Egg +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/FunnelWeaver.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class FunnelWeaver<T> +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/LadybirdSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/LadybirdSpider.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import java.io.Serializable; + +import javax.context.ApplicationScoped; + +@ApplicationScoped +class LadybirdSpider extends Spider implements Serializable +{ + + public void spinWeb() + { + + } + +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,201 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import java.lang.annotation.Annotation; + +import javax.context.RequestScoped; +import javax.inject.AnnotationLiteral; +import javax.inject.Current; +import javax.inject.TypeLiteral; +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 ProducerMethodDefinitionTest extends AbstractDeclarativeTest +{ + + private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; + + @Test(groups = "producerMethod") + @SpecAssertion(section = "2.5.3", id = "g") + public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception + { + assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; + assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "b") + public void testStaticMethod() throws Exception + { + assert getCurrentManager().resolveByType(String.class).size() == 1; + assert getCurrentManager().getInstanceByType(String.class).equals(BeanWithStaticProducerMethod.getString()); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "g") + public void testParameterizedReturnType() throws Exception + { + assert getCurrentManager().resolveByType(new TypeLiteral<FunnelWeaver<Spider>>() {}).size() == 1; + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "b"), + @SpecAssertion(section = "2.3.1", id = "a") + }) + public void testDefaultBindingType() throws Exception + { + assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; + assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().size() == 1; + assert getCurrentManager().resolveByType(Tarantula.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class); + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4.1", id = "c"), + @SpecAssertion(section="2.2", id = "l") + }) + public void testApiTypeForClassReturn() throws Exception + { + assert getCurrentManager().resolveByType(Tarantula.class).size() == 1; + Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class).iterator().next(); + + assert tarantula.getTypes().size() == 6; + assert tarantula.getTypes().contains(Tarantula.class); + assert tarantula.getTypes().contains(DeadlySpider.class); + assert tarantula.getTypes().contains(Spider.class); + assert tarantula.getTypes().contains(Animal.class); + assert tarantula.getTypes().contains(DeadlyAnimal.class); + assert tarantula.getTypes().contains(Object.class); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.1", id = "a") + public void testApiTypeForInterfaceReturn() throws Exception + { + assert getCurrentManager().resolveByType(Bite.class).size() == 1; + Bean<Bite> animal = getCurrentManager().resolveByType(Bite.class).iterator().next(); + assert animal.getTypes().size() == 2; + assert animal.getTypes().contains(Bite.class); + assert animal.getTypes().contains(Object.class); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.1", id = "b") + public void testApiTypeForPrimitiveReturn() throws Exception + { + assert getCurrentManager().resolveByType(Integer.class).size() == 1; + Bean<Integer> integer = getCurrentManager().resolveByType(Integer.class).iterator().next(); + assert integer.getTypes().size() == 2; + assert integer.getTypes().contains(int.class); + assert integer.getTypes().contains(Object.class); + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4.1", id = "b"), + @SpecAssertion(section = "2.2", id = "j") + }) + public void testApiTypeForArrayTypeReturn() throws Exception + { + assert getCurrentManager().resolveByType(Spider[].class).size() == 1; + Bean<Spider[]> spiders = getCurrentManager().resolveByType(Spider[].class).iterator().next(); + assert spiders.getTypes().size() == 2; + assert spiders.getTypes().contains(Spider[].class); + assert spiders.getTypes().contains(Object.class); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "be") + public void testBindingType() throws Exception + { + assert getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).size() == 1; + Bean<Tarantula> tarantula = getCurrentManager().resolveByType(Tarantula.class, TAME_LITERAL).iterator().next(); + assert tarantula.getBindings().size() == 1; + assert tarantula.getBindings().iterator().next().annotationType().equals(Tame.class); + } + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "ba") + public void testScopeType() throws Exception + { + assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1; + Bean<DaddyLongLegs> daddyLongLegs = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next(); + assert daddyLongLegs.getScopeType().equals(RequestScoped.class); + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bc"), + @SpecAssertion(section = "2.5.3", id = "b") + }) + public void testDeploymentType() throws Exception + { + assert getCurrentManager().resolveByType(LadybirdSpider.class).size() == 1; + Bean<LadybirdSpider> ladybirdSpider = getCurrentManager().resolveByType(LadybirdSpider.class).iterator().next(); + assert ladybirdSpider.getDeploymentType().equals(SpiderDeploymentType.class); + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bb"), + @SpecAssertion(section = "2.6.1", id = "b") + }) + public void testNamedMethod() throws Exception + { + assert getCurrentManager().resolveByType(BlackWidow.class).size() == 1; + Bean<BlackWidow> blackWidowSpider = getCurrentManager().resolveByType(BlackWidow.class).iterator().next(); + assert blackWidowSpider.getName().equals("blackWidow"); + } + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bb"), + @SpecAssertion(section = "2.6.1", id = "d"), + @SpecAssertion(section = "2.4.12", id = "a") + }) + public void testDefaultNamedMethod() throws Exception + { + assert getCurrentManager().resolveByType(DaddyLongLegs.class).size() == 1; + Bean<DaddyLongLegs> daddyLongLegsSpider = getCurrentManager().resolveByType(DaddyLongLegs.class).iterator().next(); + assert daddyLongLegsSpider.getName().equals("produceDaddyLongLegs"); + } + + + + + // Review 2.2 + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "b"), + @SpecAssertion(section = "3.4.2", id = "ba"), + @SpecAssertion(section = "2.4.5", id = "c"), + @SpecAssertion(section = "3.4.2", id = "bd") + }) + public void testStereotypeSpecifiesScope() throws Exception + { + assert getCurrentManager().resolveByType(WolfSpider.class).size() == 1; + Bean<WolfSpider> wolfSpider = getCurrentManager().resolveByType(WolfSpider.class).iterator().next(); + assert wolfSpider.getScopeType().equals(RequestScoped.class); + } + + @Test(groups="underInvestigation") + @SpecAssertion(section = "4.2", id = "d") + public void testNonStaticProducerMethodNotInherited() + { + assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 0; + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Spider.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,7 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + + +class Spider implements Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderDeploymentType.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +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 SpiderDeploymentType +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/SpiderProducer.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,73 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.inject.Produces; + +@AnotherDeploymentType +class SpiderProducer +{ + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + + @Produces @Tame public Tarantula produceTameTarantula() + { + return new DefangedTarantula(); + } + + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } + + @Produces public Spider getNullSpider() + { + return null; + } + + @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider() + { + return new FunnelWeaver<Spider>(); + } + + @Produces public Animal makeASpider() + { + return new WolfSpider(); + } + + @Produces public int getWolfSpiderSize() + { + return 4; + } + + @Produces public Spider[] getSpiders() + { + return ALL_SPIDERS; + } + + @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs() + { + return new DaddyLongLegs(); + } + + @Produces @Named @SpiderDeploymentType public LadybirdSpider getLadybirdSpider() + { + return new LadybirdSpider(); + } + + @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() + { + return new BlackWidow(); + } + + @Produces @AnimalStereotype public WolfSpider produceWolfSpider() + { + return new WolfSpider(); + } + + @Produces public Bite getBite() + { + return new Bite() {}; + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tame.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 Tame +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Tarantula.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/WolfSpider.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.definition; + +class WolfSpider implements Animal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 Yummy +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Yummy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +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 NotABusinessMethodTest +{ + + @Test(groups = { "stub", "producerMethod", "enterpriseBeans" }) + @SpecAssertion(section = "3.4", id = "d") + public void testProducerMethodIsNotBusinessMethod() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/NotABusinessMethodTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.notBusinessMethod; + +import javax.inject.Produces; + +class SpiderProducer +{ + + @Produces public FunnelWeaver<?> getAnotherFunnelWeaver() + { + return new FunnelWeaver<Object>(); + } + + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/notBusinessMethod/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "d") + public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedDisposes; + +import javax.inject.Disposes; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class SpiderProducer_Broken +{ + + @Produces + public String dispose(@Disposes String foo) + { + return "foo"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedDisposes/SpiderProducer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.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 = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "e") + public void testProducerMethodWithParameterAnnotatedObserves() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parameterAnnotatedObserves; + +import javax.event.Observes; +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class SpiderProducer_Broken +{ + + @Produces + public String observe(@Observes String foo) + { + return "foo"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parameterAnnotatedObserves/SpiderProducer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; + +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 ParameterizedTypeWithTypeParameterTest extends AbstractDeclarativeTest +{ + + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "i") + public void testParameterizedReturnTypeWithTypeParameter() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithTypeParameter; + +import javax.inject.Produces; + +class SpiderProducer +{ + + @Produces public <T> FunnelWeaver<T> getFunnelWeaver() + { + return new FunnelWeaver<T>(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithTypeParameter/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,23 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; + +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 PamaterizedTypeWithWildcardTest extends AbstractDeclarativeTest +{ + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "h") + public void testParameterizedReturnTypeWithWildcard() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.parametermizedTypeWithWildcard; + +import javax.inject.Produces; + +class SpiderProducer +{ + + @Produces public FunnelWeaver<?> getFunnelWeaver() + { + return new FunnelWeaver<Object>(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/parametermizedTypeWithWildcard/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; + +import static java.lang.annotation.ElementType.FIELD; +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.Retention; +import java.lang.annotation.Target; + +import javax.annotation.Stereotype; +import javax.context.RequestScoped; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/AnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; + +import javax.inject.Produces; +import javax.inject.Production; + +@Production +class SpiderProducer_Broken +{ + + @Produces @AnimalStereotype public Integer produceInteger() + { + return 1; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/SpiderProducer_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,29 @@ +package org.jboss.jsr299.tck.unit.implementation.producer.method.stereotypeEnforcesRequiredTypes; + +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 StereotypeEnforcesRequiredTypesTest extends AbstractDeclarativeTest +{ + + + @Test(groups = "producerMethod") + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "b"), + @SpecAssertion(section = "3.4.2", id = "bc"), + @SpecAssertion(section = "2.7.4", id = "b") + }) + public void testStereotypeEnforcesTypes() throws Exception + { + assert false; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml 2009-02-20 19:30:00 UTC (rev 1616) @@ -0,0 +1,9 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.method.definition"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + <test:SpiderDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-20 11:09:48 -0500 (Fri, 20 Feb 2009) New Revision: 1615 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.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/method/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 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/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.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/ResolutionByTypeTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Atach lots more assertions Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java 2009-02-20 13:43:37 UTC (rev 1614) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -8,17 +8,6 @@ /** * If the application directly calls an EJB remove method of an instance of a - * session bean that is a stateful session bean and declares any scope other - * than @Dependent, an UnsupportedOperationException is thrown. - */ - @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" }) - public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails() - { - assert false; - } - - /** - * If the application directly calls an EJB remove method of an instance of a * session bean that is a stateful session bean and has scope @Dependent then * no parameters are passed to the method by the container. */ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.integration.implementation.enterprise; +import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.hibernate.tck.annotations.SpecAssertion; import org.testng.annotations.Test; /** @@ -27,7 +27,7 @@ * bean proxy, as defined in Section 3.3.9, "Session bean proxies". */ @Test(groups = { "enterpriseBeans", "lifecycle", "integration", "stub" }) - @SpecAssertion(section = "6.5", id = "unknown") + @SpecAssertion(section = "3.3.8", id = "a") public void testProxyCreated() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -46,7 +46,11 @@ } @Test - @SpecAssertion(section = "2", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "2", id = "c"), + @SpecAssertion(section = "2.4", id = "a"), + @SpecAssertion(section = "3.2.3", id = "ba") + }) public void testHasScopeType() { assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; @@ -54,7 +58,11 @@ } @Test - @SpecAssertion(section = "2", id = "d") + @SpecAssertions({ + @SpecAssertion(section = "2", id = "d"), + @SpecAssertion(section = "2.5.3", id = "a"), + @SpecAssertion(section = "3.2.3", id = "bc") + }) public void testHasDeploymentType() { assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1; @@ -79,7 +87,8 @@ @SpecAssertion(section = "2.2", id = "a"), @SpecAssertion(section = "2.2", id = "d"), @SpecAssertion(section = "2.2", id = "e"), - @SpecAssertion(section = "2.2", id = "k") + @SpecAssertion(section = "2.2", id = "k"), + @SpecAssertion(section = "2.2", id = "l") }) public void testBeanTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -41,7 +41,7 @@ } @Test(groups = { "annotationDefinition", "underInvestigation" }) - @SpecAssertion(section = "2.3.2", id = "a") + @SpecAssertion(section = "2.3.2", id = "aa") public void testBindingHasCorrectTarget() { // TODO This is only a definition without any real assertion about a given @@ -50,16 +50,6 @@ assert false; } - @Test(groups = { "annotationDefinition", "underInvestigation" }) - @SpecAssertion(section = "2.3.2", id = "a") - public void testBindingHasCorrectRetention() - { - // TODO This is only a definition without any real assertion about a given - // binding type - // If there are many binding types, how do we find them? - assert false; - } - @Test(groups = { "annotationDefinition" }) @SpecAssertion(section = "2.3.2", id = "b") public void testBindingDeclaresBindingAnnotation() @@ -77,7 +67,10 @@ } @Test - @SpecAssertion(section = "2.3.3", id = "b") + @SpecAssertions({ + @SpecAssertion(section = "2.3.3", id = "b"), + @SpecAssertion(section = "3.2.3", id = "be") + }) public void testMultipleBindings() { Bean<?> model = getCurrentManager().resolveByType(Cod.class, new ChunkyBinding(true), new WhitefishBinding()).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -57,17 +57,6 @@ * TODO This text is not really a testable assertion */ @Test(groups = { "underInvestigation", "annotationDefinition", "deploymentType" }) - @SpecAssertion(section = "2.5.2", id = "b") - public void testDeploymentTypeHasCorrectRetention() - { - assert false; - } - - /** - * - * TODO This text is not really a testable assertion - */ - @Test(groups = { "underInvestigation", "annotationDefinition", "deploymentType" }) @SpecAssertion(section = "2.5.2", id = "c") public void testDeploymentTypeDeclaresDeploymentTypeAnnotation() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -22,7 +22,8 @@ @SuppressWarnings("unchecked") @Test @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "b") + @SpecAssertion(section = "2.5.6", id = "b"), + @SpecAssertion(section = "2.5.2", id = "d") }) public void testCustomDeploymentTypes() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -34,7 +34,12 @@ assert false; } - @Test @SpecAssertion(section="2.6.1", id = "a") + @Test + @SpecAssertions({ + @SpecAssertion(section="2.6.1", id = "a"), + @SpecAssertion(section="2", id="e"), + @SpecAssertion(section = "3.2.3", id = "bb") + }) public void testNonDefaultNamed() { Bean<Moose> moose = createSimpleBean(Moose.class); @@ -79,7 +84,8 @@ @Test @SpecAssertions({ @SpecAssertion(section= "2.6.3", id = "a"), - @SpecAssertion(section = "3.2.8", id = "a") + @SpecAssertion(section = "3.2.8", id = "a"), + @SpecAssertion(section = "2.6.1", id = "d") }) public void testDefaultNamed() { @@ -112,7 +118,8 @@ @Test @SpecAssertions({ @SpecAssertion(section = "2.6.3", id = "c"), - @SpecAssertion(section = "2.7", id = "a") + @SpecAssertion(section = "2.7", id = "a"), + @SpecAssertion(section = "2.7.1.3", id = "b") }) public void testSterotypeDefaultsName() { @@ -120,7 +127,11 @@ assert model.getName().equals("redSnapper"); } - @Test @SpecAssertion(section="2.6.4", id = "a") + @Test + @SpecAssertions({ + @SpecAssertion(section="2.6.4", id = "a"), + @SpecAssertion(section="2", id="e") + }) public void testNotNamedInJava() { Bean<SeaBass> model = createSimpleBean(SeaBass.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -27,23 +27,13 @@ } @Test(groups={"underInvestigation", "annotationDefinition"}) - @SpecAssertion(section="2.4.2", id = "a") + @SpecAssertion(section="2.4.2", id = "aa") public void testScopeTypeHasCorrectTarget() { assert false; } /** - * TODO This is not really a testable assertion - */ - @Test(groups={"underInvestigation", "annotationDefinition"}) - @SpecAssertion(section="2.4.2", id = "a") - public void testScopeTypeHasCorrectRetention() - { - assert false; - } - - /** * TODO If a scope has no scope type annotation, then it is not a scope and cannot be tested */ @Test(groups={"underInvestigation", "annotationDefinition"}) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -10,9 +10,9 @@ import javax.inject.Production; import javax.inject.manager.Bean; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -37,24 +37,13 @@ * here */ @Test(groups = { "underInvestigation", "annotationDefinition" }) - @SpecAssertion(section = "2.7.1", id = "a") + @SpecAssertion(section = "2.7.1", id = "aa") public void testHasCorrectTarget() { assert false; } /** - * TODO Difficult to test since all user defined stereotypes are not known - * here - */ - @Test(groups = { "underInvestigation", "annotationDefinition" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "2.7.1", id = "a") - public void testHasCorrectRetention() - { - assert false; - } - - /** * TODO If the stereotype does not have a stereotype annotation, then it * isn't one and is difficult to test */ @@ -66,7 +55,10 @@ } @Test - @SpecAssertion(section = "2.7.1.1", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.1", id = "a"), + @SpecAssertion(section = "2.4.3", id = "c") + }) public void testStereotypeWithScopeType() { Bean<Moose> moose = createSimpleBean(Moose.class); @@ -74,7 +66,10 @@ } @Test - @SpecAssertion(section = "2.7.1.1", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.1", id = "a"), + @SpecAssertion(section="2.4.5", id = "b") + }) public void testStereotypeWithoutScopeType() { Bean<Reindeer> reindeer = createSimpleBean(Reindeer.class); @@ -112,7 +107,10 @@ } @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "2.7.1.3", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.3", id = "a"), + @SpecAssertion(section = "2.6.3", id = "e") + }) public void testStereotypeWithNonEmptyNamed() { deployBeans(FallowDeer_Broken.class); @@ -126,8 +124,11 @@ } @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), - @SpecAssertion(section = "2.7.4", id = "c") }) + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "e"), + @SpecAssertion(section = "2.7.4", id = "c"), + @SpecAssertion(section = "2.7", id = "d") + }) public void testMultipleStereotypes() { Bean<HighlandCow> highlandCow = createSimpleBean(HighlandCow.class); Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -0,0 +1,29 @@ +package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeployElements; + +import javax.inject.DeploymentException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; +import org.jboss.jsr299.tck.impl.packaging.Resource; +import org.jboss.jsr299.tck.impl.packaging.Resources; +import org.testng.annotations.Test; + +@Artifact +@Resources({ + @Resource(destination="META-INF/beans.xml", source="default-beans.xml"), + @Resource(destination="WEB-INF/beans.xml", source="default-beans.xml") +}) +(a)ExpectedDeploymentException(DeploymentException.class) +@IntegrationTest +public class TooManyDeployElementsTest +{ + + @Test @SpecAssertion(section = "2.5.5", id = "e") + public void testTooManyDeployElements() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -3,6 +3,7 @@ import javax.inject.DefinitionException; import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; @@ -153,7 +154,10 @@ } @Test(groups = "enterpriseBeans") - @SpecAssertion(section = "3.3.3", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "3.3.3", id = "c"), + @SpecAssertion(section = "2.2", id = "l") + }) public void testObjectIsInAPITypes() { assert createEnterpriseBean(Laika.class).getTypes().contains(Object.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -5,24 +5,14 @@ import org.testng.annotations.Test; /** - * Sections * - * 3.3.5. Web Bean remove methods 3.3.5.1. Declaring a Web Bean remove method - * using annotations. 3.3.5.2. Declaring a Web Bean remove method using XML - * 3.3.5.3. Remove method parameters - * * @author Nicklas Karlsson * * Spec version: PRD2 */ public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest { - - /** - * If the scope is @Dependent, the application may call any EJB remove method - * of an instance of the enterprise Web Bean, but then no parameters will be - * passed to the method by the Web Bean manager - */ + @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) @SpecAssertion(section = "3.3.1", id = "da") public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() @@ -30,11 +20,6 @@ assert false; } - /** - * If the application directly calls an EJB remove method of an instance of - * an enterprise Web Bean that is a stateful session bean and declares any - * scope other than @Dependent, an UnsupportedOperationException is thrown. - */ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class) @SpecAssertion(section = "3.3.1", id = "c") public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean() @@ -42,17 +27,18 @@ assert false; } - /** - * If the application directly calls an EJB remove method of an instance of - * an enterprise Web Bean that is a stateful session bean and has scope - * @Dependent, the Web Bean manager ignores the instance when instead of - * destroying it - */ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }) @SpecAssertion(section = "3.3.1", id = "db") public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed() { assert false; } + + @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" }) + @SpecAssertion(section = "3.3.1", id = "b") + public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -153,7 +153,7 @@ assert false; } - @Test @SpecAssertion(section="3.3.1", id = "a") + @Test @SpecAssertion(section="3.3.6", id = "aa") public void testForEachEnterpriseBeanANewBeanExists() { deployBeans(Order.class, Lion.class); 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-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -171,7 +171,10 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "f") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "f"), + @SpecAssertion(section="2.3.3", id="c") + }) public void testBindingType() { deployBeans(TameTarantulaProducer.class); @@ -207,7 +210,10 @@ } @Test(groups = "producerField") - @SpecAssertion(section = "3.5.2", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "3.5.2", id = "c"), + @SpecAssertion(section="2.6.1", id = "d") + }) public void testNamedField() { deployBeans(BlackWidowProducer.class); @@ -222,7 +228,8 @@ @Test(groups = { "producerField" }) @SpecAssertions({ @SpecAssertion(section = "2.6.3", id = "b"), - @SpecAssertion(section = "3.5.4", id = "a") + @SpecAssertion(section = "3.5.4", id = "a"), + @SpecAssertion(section = "2.6.1", id = "d") }) public void testDefaultNamedField() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -4,6 +4,7 @@ import javax.inject.UnsatisfiedDependencyException; import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.testng.annotations.Test; /** @@ -19,7 +20,11 @@ * class. */ @Test(groups = { "stub", "disposalMethod" }) - @SpecAssertion(section = "3.4.6", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "3.4.6", id = "a"), + @SpecAssertion(section = "3.4.6", id = "c"), + @SpecAssertion(section = "3.4.6", id = "e") + }) public void testDisposalMethodCanBeOfSimpleOrSessionBean() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -70,7 +70,7 @@ } @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.4", id = "g") + @SpecAssertion(section = "3.4", id = "i") public void testParameterizedReturnTypeWithTypeParameter() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -93,7 +93,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.1", id = "c") + @SpecAssertions({ + @SpecAssertion(section = "3.4.1", id = "c"), + @SpecAssertion(section="2.2", id = "l") + }) public void testApiTypeForClassReturn() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -175,7 +178,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "bc") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bc"), + @SpecAssertion(section = "2.5.3", id = "b") + }) public void testDeploymentType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -186,7 +192,10 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "bb") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bb"), + @SpecAssertion(section = "2.6.1", id = "b") + }) public void testNamedMethod() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -197,7 +206,11 @@ } @Test(groups = "producerMethod") - @SpecAssertion(section = "3.4.2", id = "bb") + @SpecAssertions({ + @SpecAssertion(section = "3.4.2", id = "bb"), + @SpecAssertion(section = "2.6.1", id = "d"), + @SpecAssertion(section = "2.4.12", id = "a") + }) public void testDefaultNamedMethod() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -229,9 +242,12 @@ // Review 2.2 @Test(groups = "producerMethod") - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"), + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "b"), @SpecAssertion(section = "3.4.2", id = "ba"), - @SpecAssertion(section = "2.4.5", id = "c") }) + @SpecAssertion(section = "2.4.5", id = "c"), + @SpecAssertion(section = "3.4.2", id = "bd") + }) public void testStereotypeSpecifiesScope() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -246,9 +262,11 @@ } @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"), + @SpecAssertions({ + @SpecAssertion(section = "2.7.2", id = "b"), @SpecAssertion(section = "3.4.2", id = "bc"), - @SpecAssertion(section = "2.7.4", id = "b") }) + @SpecAssertion(section = "2.7.4", id = "b") + }) public void testStereotypeEnforcesTypes() throws Exception { Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -31,7 +31,11 @@ } @Test(groups = { "producerMethod", "broken" }) - @SpecAssertion(section = "B.1", id = "unknown") + @SpecAssertions({ + @SpecAssertion(section = "3.4", id = "c"), + @SpecAssertion(section = "3.4", id = "k"), + @SpecAssertion(section = "3.4.2", id = "a") + }) public void testProducerMethodBeanCreate() throws Exception { Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); Modified: 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-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -32,21 +32,30 @@ // *** BEAN CLASS CHECKS ****// @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.2.1", id = "ca") + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "ca"), + @SpecAssertion(section = "3.2", id = "ca") + }) public void testAbstractClassDeclaredInJavaIsNotAllowed() { createSimpleBean(Cow_Broken.class); } @Test(groups = "innerClass") - @SpecAssertion(section = "3.2.1", id = "cc") + @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") - @SpecAssertion(section = "3.2.1", id = "b") + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "b"), + @SpecAssertion(section = "3.2", id = "a") + }) public void testNonStaticInnerClassDeclaredInJavaNotAllowed() { createSimpleBean(InnerBean_Broken.class); @@ -54,7 +63,10 @@ @SuppressWarnings("unchecked") @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.2.1", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "3.2.1", id = "a"), + @SpecAssertion(section = "3.2", id = "b") + }) public void testParameterizedClassDeclaredInJavaIsNotAllowed() { createSimpleBean(ParameterizedBean_Broken.class); @@ -167,7 +179,9 @@ @Test @SpecAssertions({ @SpecAssertion(section = "3.2.5", id = "a"), - @SpecAssertion(section = "3.2.6.1", id = "b") + @SpecAssertion(section = "3.2.6.1", id = "b"), + @SpecAssertion(section = "3.1", id = "a"), + @SpecAssertion(section = "3.2.3", id = "a") }) public void testEmptyConstructorUsed() { Modified: 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-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -81,7 +81,12 @@ } @Test(groups = "beanLifecycle") - @SpecAssertion(section = "6.2", id = "unknown") + @SpecAssertions({ + @SpecAssertion(section = "6.2", id = "unknown"), + @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); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -10,9 +10,9 @@ import javax.inject.DefinitionException; import javax.inject.InconsistentSpecializationException; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.testng.annotations.Test; /** @@ -36,7 +36,7 @@ @Test @SpecAssertions({ @SpecAssertion(section = "4.3.1", id = "c"), - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "3.3.7", id = "a") }) public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() { @@ -50,7 +50,7 @@ @Test @SpecAssertions({ @SpecAssertion(section = "4.3.1", id = "d"), - @SpecAssertion(section = "3.2.7", id = "a") + @SpecAssertion(section = "3.3.7", id = "a") }) public void testSpecializingBeanHasNameOfSpecializedBean() { @@ -70,7 +70,7 @@ @Test(groups="broken") @SpecAssertions({ @SpecAssertion(section = "4.3.1", id = "f"), - @SpecAssertion(section = "3.2.7", id = "b") + @SpecAssertion(section = "3.3.7", id = "b") }) public void testSpecializedBeanNotInstantiated() throws Exception { @@ -121,21 +121,21 @@ } @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "d") + @SpecAssertion(section="3.3.7", id = "d") public void testSpecializingClassDirectlyExtendsSimpleBean() { deployBeans(Tractor_Broken.class); } @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "d") + @SpecAssertion(section="3.3.7", id = "d") public void testSpecializingClassDirectlyExtendsNothing() { deployBeans(Cow_Broken.class); } @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.2.7", id = "d") + @SpecAssertion(section="3.3.7", id = "d") public void testSpecializingClassImplementsInterfaceAndExtendsNothing() { deployBeans(Donkey_Broken.class); 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-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -31,6 +31,7 @@ import javax.inject.manager.InjectionPoint; import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; import org.jboss.jsr299.tck.literals.CurrentBinding; import org.testng.annotations.Test; @@ -232,7 +233,10 @@ } @Test(groups = { "injectionPoint" }) - @SpecAssertion(section = "5.6.1", id = "za") + @SpecAssertions({ + @SpecAssertion(section = "5.6.1", id = "za"), + @SpecAssertion(section = "2.5.1", id="a") + }) public void testStandardDeployment() throws Exception { deployBeans(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-20 16:09:48 UTC (rev 1615) @@ -104,7 +104,8 @@ @Test(groups="injection") @SpecAssertions({ @SpecAssertion(section = "2.3.5", id = "b"), - @SpecAssertion(section = "5.9.2", id = "gb") + @SpecAssertion(section = "5.9", id = "gb"), + @SpecAssertion(section = "2.3.3", id = "d") }) public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean() { @@ -138,8 +139,12 @@ assert getCurrentManager().resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).contains(soleBean); } - @Test(groups="resolution") - @SpecAssertion(section="5.9", id = "fd") + @Test(groups="resolution") + @SpecAssertions({ + @SpecAssertion(section="5.9", id = "fd"), + @SpecAssertion(section="2.2", id="bb"), + @SpecAssertion(section="2.2", id="ba") + }) public void testResolveByTypeWithTypeParameter() throws Exception { Bean<ScottishFishFarmer> scottishFishFarmerBean = createSimpleBean(ScottishFishFarmer.class); Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml 2009-02-20 16:09:48 UTC (rev 1615) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee"> + <Deploy> + <Standard /> + <Production /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 13:43:37 UTC (rev 1614) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 16:09:48 UTC (rev 1615) @@ -42,10 +42,14 @@ <text>A bean may have multiple bean types</text> </assertion> - <assertion id="b"> - <text>A bean type may be a parameterized type with an actual type parameter. For the purposes of the typesafe resolution algorithm defined in Section 5.9, "Typesafe resolution algorithm", parameterized bean types are considered identical by the container only if both the type and the type parameters (if any) are identical</text> + <assertion id="ba"> + <text>A bean type may be a parameterized type with an actual type parameter.</text> </assertion> + <assertion id="bb"> + <text>For the purposes of the typesafe resolution algorithm defined in Section 5.9, "Typesafe resolution algorithm", parameterized bean types are considered identical by the container only if both the type and the type parameters (if any) are identical</text> + </assertion> + <assertion id="c"> <text>Bean types may not declare a type variable. If the type of an injection point is a parameterized type with a type variable, a DefinitionException is thrown by the container at deployment time.</text> </assertion> @@ -125,8 +129,9 @@ <text>The @BindingType meta-annotation may be omitted, and the binding type may be declared in beans.xml</text> </assertion> - <assertion id="d"> + <assertion id="d" testable="false"> <text>A binding type may define annotation members</text> + <note>This is true by default in the JLS</note> </assertion> </section> @@ -141,7 +146,7 @@ </assertion> <assertion id="c"> - <text>A bean's bindings are declared by annotating the field with the binding types</text> + <text>A bean's bindings are declared by annotating the producer field with the binding types</text> </assertion> <assertion id="d"> @@ -208,34 +213,38 @@ <text>All beans have a scope</text> </assertion> - <assertion id="b"> + <assertion id="b" testable="false"> <text>A scope type is represented by an annotation type.</text> + <note>This is a statement of intent</note> </assertion> - <assertion id="c"> + <assertion id="c" testable="false"> <text>The set of scope types is extensible</text> + <note>This is a statement of intent</note> </assertion> </section> <section id="2.4.1" title="Built-in scope types"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The @RequestScoped, @ApplicationScoped and @SessionScoped annotations defined in Section 8.5, "Context management for built-in scopes" represent the standard scopes defined by the Java Servlets specification</text> + <note>This is a statement of intent</note> </assertion> - <assertion id="b"> - <text>The @ConversationScoped annotation represents the conversation scope -defined in Section 8.5.4, "Conversation context lifecycle".</text> + <assertion id="b" testable="false"> + <text>The @ConversationScoped annotation represents the conversation scope defined in Section 8.5.4, "Conversation context lifecycle".</text> + <note>This is a statement of intent</note> </assertion> - <assertion id="c"> + <assertion id="c" testable="false"> <text>The @Dependent pseudo-scope is for dependent objects, as defined in Section 8.3, "Dependent pseudo-scope"</text> + <note>This is a statement of intent</note> </assertion> </section> <section id="2.4.2" title="Defining new scope types"> <assertion id="aa"> - <text>A scope type is a Java annotation defined as @Target({TYPE, METHOD, FIELD})~ and @Retention(RUNTIME)Z</text> + <text>A scope type is a Java annotation defined as @Target({TYPE, METHOD, FIELD})~ and @Retention(RUNTIME)~</text> </assertion> <assertion id="ab" testable="false"> @@ -302,8 +311,9 @@ </section> <section id="2.5" title="Deployment types"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The set of deployment types is extensible</text> + <note>This is a statement of intent</note> </assertion> </section> @@ -311,14 +321,16 @@ <assertion id="a"> <text>All standard beans defined by this specification, and provided by the container, are defined using the @Standard deployment type</text> + <note>This is tested in the test for each bean defined. See 5.6.1.za, 5.7.2.ca, 8.5.4.i</note> </assertion> <assertion id="b"> <text>No bean may be declared with the @Standard deployment type unless explicitly required by this specification</text> </assertion> - <assertion id="c"> + <assertion id="c" testable="false"> <text>Application beans may be defined using the @Production deployment type</text> + <note>This is a statement of intent</note> </assertion> </section> @@ -456,7 +468,7 @@ </assertion> <assertion id="c"> - <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the field.</text> + <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the producer field.</text> </assertion> <assertion id="d"> @@ -511,8 +523,9 @@ <text>A stereotype may specify that all beans with the stereotype have defaulted bean names</text> </assertion> - <assertion id="b"> + <assertion id="b" testable="false"> <text>A bean may declare zero stereotypes</text> + <note>I can't see how to test this</note> </assertion> <assertion id="c"> @@ -686,8 +699,9 @@ </section> <section id="2.7.5" title="Built-in stereotypes"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The built-in @Model stereotype is intended for use with beans that define the model layer of an MVC web application architecture such as JSF</text> + <note>Tested by API signature test</note> </assertion> </section> @@ -701,7 +715,7 @@ <text>The bean class is a concrete class and is not required to implement any special interface or extend any special superclass</text> </assertion> - <assertion id="b"> + <assertion id="b" testable="false"> <text>If the application calls a producer method directly, instead of letting the container call it, the returned object is not a contextual instance and the capabilities listed in Section 2.1, "Functionality provided by the container to the bean" will not be available to the returned object.</text> </assertion> </section> @@ -715,10 +729,14 @@ <text>The bean class of a simple bean may not be a parameterized type</text> </assertion> - <assertion id="c"> - <text>The bean class of a simple bean may not be an abstract class, unless the simple bean is a decorator</text> + <assertion id="ca"> + <text>The bean class of a simple bean may not be an abstract class, ~unless the simple bean is a decorator~</text> </assertion> + <assertion id="cb"> + <text>The bean class of a simple bean may not be an abstract class, _unless the simple bean is a decorator_</text> + </assertion> + <assertion id="d"> <text>If the bean class of a simple bean is annotated with both the @Interceptor and @Decorator stereotypes, a DefinitionException is thrown by the container at deployment time.</text> </assertion> @@ -819,10 +837,26 @@ <text>A simple bean with a constructor that takes no parameters does not require any special annotations</text> </assertion> - <assertion id="b"> - <text>A bean class may also specify a scope, name, deployment type, stereotypes and/or bindings</text> + <assertion id="ba"> + <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text> </assertion> + <assertion id="bb"> + <text>A bean class may also specify a ~scope,~ name~, deployment type, stereotypes and/or bindings~</text> + </assertion> + + <assertion id="bc"> + <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text> + </assertion> + + <assertion id="bd"> + <text>A bean class may also specify ~a scope, name, deployment type, ~stereotypes~ and/or bindings~</text> + </assertion> + + <assertion id="be"> + <text>A bean class may also specify ~a scope, name, deployment type, stereotypes and/or~ bindings</text> + </assertion> + <assertion id="c"> <text>A simple bean may extend another simple bean</text> </assertion> @@ -880,7 +914,7 @@ </assertion> <assertion id="bc"> <text>Every class that satisfies the requirements of Section 3.2.1, "Which Java classes are beans?" is a bean, with scope, deployment type and bindings defined using annotations. -Additionally, for each such simple bean, a second simple bean exists which has the same defined by annotations</text> +Additionally, for each such simple bean, a second simple bean exists which has the same injected fields defined by annotations</text> </assertion> <assertion id="c"> <text>Every class that satisfies the requirements of Section 3.2.1, "Which Java classes are beans?" is a bean, with scope, deployment type and bindings defined using annotations. @@ -1007,8 +1041,9 @@ </section> <section id="3.2.8" title="Default name for a simple bean"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The default name for a simple bean is the unqualified class name of the bean class, after converting the first character to lower case</text> + <note>This is a reference to the EJB specification</note> </assertion> </section> @@ -1100,10 +1135,26 @@ <text>A session bean does not require any special annotations</text> </assertion> - <assertion id="b"> - <text>A bean class may also specify a scope, name, deployment type, stereotypes and/or bindings</text> + <assertion id="ba"> + <text>A bean class may also specify a scope~, name, deployment type, stereotypes and/or bindings~</text> </assertion> + <assertion id="bb"> + <text>A bean class may also specify a ~scope, ~name~, deployment type, stereotypes and/or bindings~</text> + </assertion> + + <assertion id="bc"> + <text>A bean class may also specify a ~scope, name, ~deployment type~, stereotypes and/or bindings~</text> + </assertion> + + <assertion id="bd"> + <text>A bean class may also specify a ~scope, name, deployment type, ~stereotypes ~and/or bindings~</text> + </assertion> + + <assertion id="be"> + <text>A bean class may also specify a ~scope, name, deployment type, stereotypes and/or~ bindings~</text> + </assertion> + <assertion id="c"> <text>A session bean class may extend another bean class</text> </assertion> @@ -1259,7 +1310,7 @@ <text>If a producer method return type contains a type variable, a DefinitionException is thrown by the container at deployment time</text> </assertion> - <assertion id="j"> + <assertion id="j" testable="false"> <text>The application may call producer methods directly. However, if the application calls a producer method directly, no parameters will be passed to the producer method by the container; the returned object is not bound to any context; and its lifecycle is not managed by the container</text> </assertion>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1614 - tck/trunk/impl/src/main/resources.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-20 08:43:37 -0500 (Fri, 20 Feb 2009) New Revision: 1614 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: readd xsd to audit Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 13:33:38 UTC (rev 1613) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 13:43:37 UTC (rev 1614) @@ -1,7 +1,7 @@ <specification xmlns="http://jboss.com/products/webbeans/tck/audit" - xmlns:xsi="http://jboss.com/products/webbeans/tck/audit http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/webbeans/tck/audit file:///Users/pmuir/workspace/hibernate-validator-parent/tck-utils/api/src/main/resources/tck-audit.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/webbeans/tck/audit http://snapshots.jboss.org/maven2/org/hibernate/tck-utils-api/0.9-SNAPSHO..." name="JSR-299: Java Contexts and Dependency Injection" version="Revised Public Review Draft"> @@ -1680,11 +1680,11 @@ <WebServiceRef> element. For a web service, a JNDI name or mapped name must be specified using the <name> or <mappedName> child elements of the <WebServiceRef> element. Optionally, a URL pointing to a WSDL document may be specified using the <wsdlLocation> child element</text> </assertion> - <assertion name="k"> + <assertion id="k"> <text>The JNDI name specified by the <name> element must be a name in the global java:global or application java:app naming context</text> </assertion> - <assertion name="l"> + <assertion id="l"> <text>Optionally, one or more bindings may be specified for resources in XML. If no binding is explicitly specified, the default binding @Current is assumed.</text> </assertion>

17 years, 1 month

1
0
0 / 0

← Newer
1
...
10
11
12
13
14
15
16
...
37
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009