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 +(a)BeansXml(&quot;beans.xml&quot;) +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 >