Author: nickarls Date: 2008-11-06 06:55:14 -0500 (Thu, 06 Nov 2008) New Revision: 257 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/EnterpriseBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Armant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Beagle.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Boxer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Bullmastiff.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Dachshund.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/GoldenRetriever.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Greyhound.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Husky.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/IrishTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/JackRussellTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pekingese.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Poodle.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pug.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pumi.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RequestScopedStateless.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Rottweiler.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RussellTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Saluki.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Spitz.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Toller.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/WelshCorgie.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Whippet.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreatDane.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreaterDane.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Hound.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/HoundOfBaskerville.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Laika.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Pitbull.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreatDane.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreaterDane.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Laika.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Beagle.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Boxer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Bullmastiff.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dachshund.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Greyhound.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Husky.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/IrishTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JackRussellTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pekingese.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pug.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pumi.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RequestScopedStateless.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RussellTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Toller.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/WelshCorgie.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java ri/trunk/webbeans-ri/testng.xml Log: EJB restructure tests Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java 2008-11-06 11:55:14 UTC (rev 257) @@ -39,6 +39,7 @@ private AnnotatedClass<T> xmlAnnotatedItem; private Set<InjectableField<?>> injectableFields; private Set<InjectableMethod<Object>> initializerMethods; + protected boolean annotationDefined; /** * @@ -50,6 +51,7 @@ { this.annotatedItem = annotatedItem; this.xmlAnnotatedItem = xmlAnnotatedItem; + annotationDefined = annotatedItem != null ? true : false; } @Override Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-06 11:55:14 UTC (rev 257) @@ -5,8 +5,10 @@ import javax.webbeans.DefinitionException; import javax.webbeans.Dependent; import javax.webbeans.Interceptor; +import javax.webbeans.Specializes; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.ejb.EJB; import org.jboss.webbeans.ejb.EjbMetaData; import org.jboss.webbeans.introspector.AnnotatedClass; @@ -30,12 +32,43 @@ checkEnterpriseBeanTypeAllowed(); checkEnterpriseScopeAllowed(); checkConflictingRoles(); + checkSpecialization(); } - + + private void checkSpecialization() + { + if (!getType().isAnnotationPresent(Specializes.class)) + { + return; + } + if (annotationDefined) + { + if (!isEJB(getType().getSuperclass())) + { + throw new DefinitionException("Annotation defined specializing EJB must have EJB superclass"); + } + } else + { + if (!isEJB(getType())) + { + throw new DefinitionException("XML defined specializing EJB must have annotation defined EJB implementation"); + } + } + } + + private boolean isEJB(Class<? super T> clazz) + { + return clazz.isAnnotationPresent(EJB.SINGLETON_ANNOTATION) + || clazz.isAnnotationPresent(EJB.STATEFUL_ANNOTATION) + || clazz.isAnnotationPresent(EJB.STATELESS_ANNOTATION); + } + private void checkEnterpriseBeanTypeAllowed() { - if (getEjbMetaData().isMessageDriven()) { - throw new DefinitionException("Message Driven Beans can't be Web Beans"); + if (getEjbMetaData().isMessageDriven()) + { + throw new DefinitionException( + "Message Driven Beans can't be Web Beans"); } } @@ -43,29 +76,45 @@ { return ejbMetaData; } - - protected void checkConflictingRoles() { - if (getType().isAnnotationPresent(Interceptor.class)) { + + protected void checkConflictingRoles() + { + if (getType().isAnnotationPresent(Interceptor.class)) + { throw new DefinitionException("Enterprise beans can't be interceptors"); } - if (getType().isAnnotationPresent(Decorator.class)) { + if (getType().isAnnotationPresent(Decorator.class)) + { throw new DefinitionException("Enterprise beans can't be decorators"); } } - + /** - * Check that the scope type is allowed by the stereotypes on the bean and the bean type - * @param type + * Check that the scope type is allowed by the stereotypes on the bean and + * the bean type + * + * @param type */ protected void checkEnterpriseScopeAllowed() { - if (getEjbMetaData().isStateless() && !getScopeType().equals(Dependent.class)) + if (getEjbMetaData().isStateless() + && !getScopeType().equals(Dependent.class)) { - throw new DefinitionException("Scope " + getScopeType() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans"); + throw new DefinitionException("Scope " + getScopeType() + + " is not allowed on stateless enterpise beans for " + + getType() + + ". Only @Dependent is allowed on stateless enterprise beans"); } - if (getEjbMetaData().isSingleton() && (!(getScopeType().equals(Dependent.class) || getScopeType().equals(ApplicationScoped.class)))) + if (getEjbMetaData().isSingleton() + && (!(getScopeType().equals(Dependent.class) || getScopeType() + .equals(ApplicationScoped.class)))) { - throw new DefinitionException("Scope " + getScopeType() + " is not allowed on singleton enterpise beans for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans"); + throw new DefinitionException( + "Scope " + + getScopeType() + + " is not allowed on singleton enterpise beans for " + + getType() + + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans"); } } Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class EnterpriseBeanLifecycleTest -{ - - @Test(groups="removeMethod") @SpecAssertion(section="3.2.3") - public void testInjectonOfParametersIntoRemoveMethod() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedBeanAlwaysUsed() - { - // TODO Placeholder - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,428 +0,0 @@ -package org.jboss.webbeans.test; - -import javax.webbeans.DefinitionException; -import javax.webbeans.DeploymentException; -import javax.webbeans.UnremovedException; - -import org.jboss.webbeans.model.bean.EnterpriseBeanModel; -import org.jboss.webbeans.test.beans.Giraffe; -import org.jboss.webbeans.test.beans.GreatDane; -import org.jboss.webbeans.test.beans.GreaterDane; -import org.jboss.webbeans.test.beans.Laika; -import org.jboss.webbeans.test.beans.Leopard; -import org.jboss.webbeans.test.beans.Pitbull; -import org.jboss.webbeans.test.beans.broken.Armant; -import org.jboss.webbeans.test.beans.broken.Beagle; -import org.jboss.webbeans.test.beans.broken.Boxer; -import org.jboss.webbeans.test.beans.broken.Bullmastiff; -import org.jboss.webbeans.test.beans.broken.Dachshund; -import org.jboss.webbeans.test.beans.broken.GoldenRetriever; -import org.jboss.webbeans.test.beans.broken.Greyhound; -import org.jboss.webbeans.test.beans.broken.Husky; -import org.jboss.webbeans.test.beans.broken.IrishTerrier; -import org.jboss.webbeans.test.beans.broken.JackRussellTerrier; -import org.jboss.webbeans.test.beans.broken.Pekingese; -import org.jboss.webbeans.test.beans.broken.Poodle; -import org.jboss.webbeans.test.beans.broken.Pug; -import org.jboss.webbeans.test.beans.broken.Pumi; -import org.jboss.webbeans.test.beans.broken.Rottweiler; -import org.jboss.webbeans.test.beans.broken.RussellTerrier; -import org.jboss.webbeans.test.beans.broken.Saluki; -import org.jboss.webbeans.test.beans.broken.Spitz; -import org.jboss.webbeans.test.beans.broken.Toller; -import org.jboss.webbeans.test.beans.broken.WelshCorgie; -import org.jboss.webbeans.test.beans.broken.Whippet; -import org.jboss.webbeans.test.util.Util; -import org.testng.annotations.Test; - -@SuppressWarnings("unused") -@SpecVersion("PDR") -public class EnterpriseBeanModelTest extends AbstractTest -{ - - @Test - @SpecAssertion(section = "3.3") - public void testStatelessWithDependentScopeOK() - { - EnterpriseBeanModel<Giraffe> giraffe = Util.createEnterpriseBeanModel(Giraffe.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testStatelessWithRequestScopeFails() - { - EnterpriseBeanModel<Beagle> beagle = Util.createEnterpriseBeanModel(Beagle.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testStatelessWithConversationScopeFails() - { - EnterpriseBeanModel<Boxer> boxer = Util.createEnterpriseBeanModel(Boxer.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testStatelessWithSessionScopeFails() - { - EnterpriseBeanModel<Bullmastiff> boxer = Util.createEnterpriseBeanModel(Bullmastiff.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testStatelessWithApplicationScopeFails() - { - EnterpriseBeanModel<Dachshund> dachshund = Util.createEnterpriseBeanModel(Dachshund.class, manager); - } - - @Test - @SpecAssertion(section = "3.3") - public void testSingletonWithDependentScopeOK() - { - EnterpriseBeanModel<GreatDane> greatDane = Util.createEnterpriseBeanModel(GreatDane.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testSingletonWithRequestScopeFails() - { - EnterpriseBeanModel<Greyhound> greyhound = Util.createEnterpriseBeanModel(Greyhound.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testSingletonWithConversationScopeFails() - { - EnterpriseBeanModel<Husky> husky = Util.createEnterpriseBeanModel(Husky.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testSingletonWithSessionScopeFails() - { - EnterpriseBeanModel<IrishTerrier> irishTerrier = Util.createEnterpriseBeanModel(IrishTerrier.class, manager); - } - - @Test - @SpecAssertion(section = "3.3") - public void testSingletonWithApplicationScopeOK() - { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testEnterpriseBeanInterceptorFails() - { - EnterpriseBeanModel<Pug> pug = Util.createEnterpriseBeanModel(Pug.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testEnterpriseBeanDecoratorFails() - { - EnterpriseBeanModel<Pekingese> pekingese = Util.createEnterpriseBeanModel(Pekingese.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class, groups="enterpriseBeans") - @SpecAssertion(section = "3.3") - public void testMultipleAnnotationDefinedEnterpriseBeansWithSameImplementationClassFails() - { - assert false; - } - - @Test(groups={"webbeansxml", "enterpriseBeans"}) - @SpecAssertion(section = "3.3") - public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassOK() - { - assert false; - } - - @Test(expectedExceptions = DeploymentException.class, groups={"enterpriseBeans", "specialization"}) - @SpecAssertion(section = "3.3") - public void testMultipleEnabledSpecializedEnterpriseBeanFails() - { - assert false; - } - - @Test(groups="enterpriseBeans") - @SpecAssertion(section = "3.3.1") - public void testAnnotatedEnterpriseBean() - { - assert false; - } - - @Test(groups="enterpriseBeans") - @SpecAssertion(section = "3.3.1") - public void testAnnotatedEnterpriseBeanComplementedWithXML() - { - assert false; - } - - @Test(groups={"enterpriseBeans", "ejbjarxml"}) - @SpecAssertion(section = "3.3.1") - public void testEJBJARDefinedEnterpriseBean() - { - assert false; - } - - @Test(groups={"enterpriseBeans", "ejbjarxml"}) - @SpecAssertion(section = "3.3.1") - public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() - { - assert false; - } - - @Test(groups="enterpriseBeans") - @SpecAssertion(section = "3.3.2") - public void testAPITypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() - { - assert false; - } - - @Test(groups="enterpriseBeans") - @SpecAssertion(section = "3.3.2") - public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInAPITypes() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.3.2") - public void testObjectIsInAPITypes() - { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); - assert laika.getApiTypes().contains(Object.class); - } - - @Test(groups="enterpriseBeans") - @SpecAssertion(section = "3.3.2") - public void testRemoteInterfacesAreNotInAPITypes() - { - assert false; - } - - @Test(groups={"enterpriseBeans", "producerMethod", "observerMethod", "renoveMethod", "webbeansxml"}) - @SpecAssertion(section = "3.3.4") - public void testXMLDefinedEnterpriseBeanIgnoresProducerAndDisposalAndObserverAnnotations() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class, groups={"enterpriseBeans", "ejbjarxml", "singletons"}) - @SpecAssertion(section = "3.3.4") - public void testXMLDefinedSingletonsFail() - { - assert false; - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3") - public void testMessageDrivenBeansNotOK() - { - EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager); - } - - @Test(groups={"enterpriseBeans", "removeMethod"}) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanRemoveMethodCalledOnDestroy() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodInDependentScopeOK() - { - EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodInApplicationScopeFails() - { - EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodInSessionScopeFails() - { - EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodInConversationScopeFails() - { - EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodInRequestScopeFails() - { - EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager); - } - - @Test(expectedExceptions = UnremovedException.class, groups={"enterpriseMethods", "removeMethod"}) - @SpecAssertion(section = "3.3.5") - public void testStatefulEnterpriseBeanWithoutRemoveMethodNotExplicitlyDestroyedBeforeManagerAttemptFails() - { - assert false; - } - - @Test(groups={"enterpriseBeans", "removeMethod"}) - @SpecAssertion(section = "3.3.5") - public void testNoParametersPassedWhenEnterpriseBeanRemoveMethodCalledFromApplication() - { - assert false; - } - - @Test(groups={"enterpriseBeans", "removeMethod"}) - @SpecAssertion(section = "3.3.5") - public void testWebBeanRemoveMethodCallRemovesInstanceFromContext() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.3.5.1") - public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod() - { - EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager); - assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy"); - } - - @Test - @SpecAssertion(section = "3.3.5.1") - public void testAnnotationDefinedEnterpriseBeanWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod() - { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); - assert laika.getRemoveMethod() == null; - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testEnterpriseBeanWithMultipleDestructorAnnotationsFail() - { - EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testAnnotationDefinedEnterpriseBeanWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails() - { - EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testAnnotationDefinedEnterpriseBeanWithDestructorWithDisposesParameterFails() - { - EnterpriseBeanModel<Pumi> pumi = Util.createEnterpriseBeanModel(Pumi.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testEnterpriseBeanWithInitializerAnnotationOnRemoveMethodFails() - { - EnterpriseBeanModel<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBeanModel(JackRussellTerrier.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testEnterpriseBeanWithProducerAnnotationOnRemoveMethodFails() - { - EnterpriseBeanModel<RussellTerrier> russellTerrier = Util.createEnterpriseBeanModel(RussellTerrier.class, manager); - } - - @Test(expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "3.3.5.1") - public void testEnterpriseBeanWithRemoveMethodTakingObserverAnnotatedParameterFails() - { - EnterpriseBeanModel<Toller> toller = Util.createEnterpriseBeanModel(Toller.class, manager); - } - - // TODO Separate section for XML defined beans? - - @Test(groups={"removeMethod", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.5.3") - public void testRemoveMethodParameters() - { - assert false; - } - - @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testAnnotationDefinedSpecializingEnterpriseBeanNotDirectlyExtendingAnnotationDefinedEnterpriseBeanFails() - { - EnterpriseBeanModel<GreaterDane> greaterDane = Util.createEnterpriseBeanModel(GreaterDane.class, manager); - } - - @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testXMLDefinedSpecializingEnterpriseBeanNotImplementingAnnotationDefinedEnterpriseBeanFails() - { - assert false; - } - - @Test(groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testSpecializingBeanInheritsBindingTypes() - { - assert false; - } - - @Test(groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testSpecializingBeanInheritsNameIfAny() - { - assert false; - } - - @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testSpecializingNotSupportingLocalInterfacesOfSpecializedFails() - { - assert false; - } - - @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testSpecializingNotSupportingLocalViewOfSpecializedFails() - { - assert false; - } - - @Test(groups={"specialization", "enterpriseBeans"}) - @SpecAssertion(section = "3.3.6") - public void testXMLDefinedSpecializationOnAnnotationDefinedBean() - { - assert false; - } - - @Test - @SpecAssertion(section = "3.3.7") - public void testDefaultName() - { - EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); - assert pitbull.getName().equals("pitbull"); - } - - @Test(expectedExceptions=DefinitionException.class) - public void testStatelessEnterpriseBeansWithDestructorAnnotationFails() - { - EnterpriseBeanModel<WelshCorgie> welshCorgie = Util.createEnterpriseBeanModel(WelshCorgie.class, manager); - } - -/* - @Test - @SpecAssertion(section = "3.3.5.1") - public void test() - { - assert false; - } -*/ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreatDane.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreatDane.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreatDane.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Dependent; - -import org.jboss.webbeans.test.annotations.Singleton; - -@Singleton -@Dependent -public class GreatDane -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreaterDane.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreaterDane.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreaterDane.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.Specializes; - -@Specializes -public class GreaterDane extends GreatDane -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Laika.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Laika.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Laika.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.webbeans.ApplicationScoped; - -import org.jboss.webbeans.test.annotations.Singleton; - -@Singleton -@ApplicationScoped -public class Laika -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans; - -import javax.ejb.Stateful; -import javax.webbeans.Named; - -@Stateful -@Named -public class Pitbull -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -public class Armant -{ - @Remove - public void destroy() { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Beagle.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Beagle.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Beagle.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.RequestScoped; - -@Stateless -@RequestScoped -public class Beagle -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Boxer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Boxer.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Boxer.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.ConversationScoped; - -@Stateless -@ConversationScoped -public class Boxer -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Bullmastiff.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Bullmastiff.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Bullmastiff.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.SessionScoped; - -@Stateless -@SessionScoped -public class Bullmastiff -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dachshund.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dachshund.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dachshund.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.ApplicationScoped; - -@Stateless -@ApplicationScoped -public class Dachshund -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.Destructor; - -@Stateful -public class GoldenRetriever -{ - @Destructor - public void destroy() { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Greyhound.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Greyhound.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Greyhound.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.Singleton; - -@Singleton -@RequestScoped -public class Greyhound -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Husky.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Husky.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Husky.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.webbeans.ConversationScoped; - -import org.jboss.webbeans.test.annotations.Singleton; - -@Singleton -@ConversationScoped -public class Husky -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/IrishTerrier.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/IrishTerrier.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/IrishTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.webbeans.SessionScoped; - -import org.jboss.webbeans.test.annotations.Singleton; - -@Singleton -@SessionScoped -public class IrishTerrier -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JackRussellTerrier.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JackRussellTerrier.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JackRussellTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Initializer; - -@Stateful -public class JackRussellTerrier -{ - @Remove - @Initializer - public void destroy() { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pekingese.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pekingese.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pekingese.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.Decorator; - -@Stateless -@Decorator -public class Pekingese -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.ApplicationScoped; - -@Stateful -@ApplicationScoped -public class Poodle -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pug.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pug.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pug.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.Interceptor; - -@Stateless -@Interceptor -public class Pug -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pumi.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pumi.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pumi.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Disposes; - -import org.jboss.webbeans.test.annotations.Tame; -import org.jboss.webbeans.test.beans.Horse; - -@Stateful -public class Pumi -{ - @Remove - public void destroy(@Disposes @Tame Horse horse) { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RequestScopedStateless.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RequestScopedStateless.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RequestScopedStateless.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.RequestScoped; - -@RequestScoped -@Stateless -public class RequestScopedStateless -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.SessionScoped; - -@Stateful -@SessionScoped -public class Rottweiler -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RussellTerrier.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RussellTerrier.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RussellTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Produces; - -@Stateful -public class RussellTerrier -{ - @Remove - @Produces - public void destroy() { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.RequestScoped; - -@Stateful -@RequestScoped -public class Saluki -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.ConversationScoped; - -@Stateful -@ConversationScoped -public class Spitz -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Toller.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Toller.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Toller.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Observes; - -import org.jboss.webbeans.test.annotations.Tame; -import org.jboss.webbeans.test.beans.Horse; - -@Stateful -public class Toller -{ - @Remove - public void destroy(@Observes @Tame Horse horse) { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/WelshCorgie.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/WelshCorgie.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/WelshCorgie.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateless; -import javax.webbeans.Destructor; - -@Stateless -public class WelshCorgie -{ - @Destructor - public void destroy() { - - } -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java 2008-11-06 11:55:14 UTC (rev 257) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.beans.broken; - -import javax.ejb.Stateful; -import javax.webbeans.Destructor; - -@Stateful -public class Whippet -{ - @Destructor - public void destroy1() { - - } - - @Destructor - public void destroy2() { - - } -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/EnterpriseBeanLifecycleTest.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/EnterpriseBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/EnterpriseBeanLifecycleTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,63 @@ +package org.jboss.webbeans.test.ejb.lifecycle; + +import javax.webbeans.UnremovedException; + +import org.jboss.webbeans.test.SpecAssertion; +import org.testng.annotations.Test; + +public class EnterpriseBeanLifecycleTest +{ + + @Test(groups="removeMethod") @SpecAssertion(section="3.2.3") + public void testInjectonOfParametersIntoRemoveMethod() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedBeanAlwaysUsed() + { + // TODO Placeholder + assert false; + } + + + @Test(expectedExceptions = UnremovedException.class, groups={"enterpriseMethods", "removeMethod"}) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodNotExplicitlyDestroyedBeforeManagerAttemptFails() + { + assert false; + } + + + @Test(groups={"enterpriseBeans", "removeMethod"}) + @SpecAssertion(section = "3.3.5") + public void testWebBeanRemoveMethodCallRemovesInstanceFromContext() + { + assert false; + } + + + @Test(groups={"enterpriseBeans", "removeMethod"}) + @SpecAssertion(section = "3.3.5") + public void testNoParametersPassedWhenEnterpriseBeanRemoveMethodCalledFromApplication() + { + assert false; + } + + @Test(groups={"enterpriseBeans", "removeMethod"}) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanRemoveMethodCalledOnDestroy() + { + assert false; + } + + @Test(groups={"removeMethod", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.5.3") + public void testRemoveMethodParameters() + { + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/lifecycle/EnterpriseBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:mergeinfo + Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,219 @@ +package org.jboss.webbeans.test.ejb.model; + +import javax.webbeans.DefinitionException; + +import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.test.AbstractTest; +import org.jboss.webbeans.test.SpecAssertion; +import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.beans.Giraffe; +import org.jboss.webbeans.test.beans.Leopard; +import org.jboss.webbeans.test.ejb.model.invalid.Beagle; +import org.jboss.webbeans.test.ejb.model.invalid.Boxer; +import org.jboss.webbeans.test.ejb.model.invalid.Bullmastiff; +import org.jboss.webbeans.test.ejb.model.invalid.Dachshund; +import org.jboss.webbeans.test.ejb.model.invalid.Greyhound; +import org.jboss.webbeans.test.ejb.model.invalid.Husky; +import org.jboss.webbeans.test.ejb.model.invalid.IrishTerrier; +import org.jboss.webbeans.test.ejb.model.invalid.Pekingese; +import org.jboss.webbeans.test.ejb.model.invalid.Pug; +import org.jboss.webbeans.test.ejb.model.valid.GreatDane; +import org.jboss.webbeans.test.ejb.model.valid.Laika; +import org.jboss.webbeans.test.ejb.model.valid.Pitbull; +import org.jboss.webbeans.test.util.Util; +import org.testng.annotations.Test; + +@SpecVersion("PDR") +@SuppressWarnings("unused") +public class EnterpriseBeanDeclarationTest extends AbstractTest +{ + + @Test + @SpecAssertion(section = "3.3") + public void testStatelessWithDependentScopeOK() + { + EnterpriseBeanModel<Giraffe> giraffe = Util.createEnterpriseBeanModel(Giraffe.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testStatelessWithRequestScopeFails() + { + EnterpriseBeanModel<Beagle> beagle = Util.createEnterpriseBeanModel(Beagle.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testStatelessWithConversationScopeFails() + { + EnterpriseBeanModel<Boxer> boxer = Util.createEnterpriseBeanModel(Boxer.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testStatelessWithSessionScopeFails() + { + EnterpriseBeanModel<Bullmastiff> boxer = Util.createEnterpriseBeanModel(Bullmastiff.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testStatelessWithApplicationScopeFails() + { + EnterpriseBeanModel<Dachshund> dachshund = Util.createEnterpriseBeanModel(Dachshund.class, manager); + } + + @Test + @SpecAssertion(section = "3.3") + public void testSingletonWithDependentScopeOK() + { + EnterpriseBeanModel<GreatDane> greatDane = Util.createEnterpriseBeanModel(GreatDane.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testSingletonWithRequestScopeFails() + { + EnterpriseBeanModel<Greyhound> greyhound = Util.createEnterpriseBeanModel(Greyhound.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testSingletonWithConversationScopeFails() + { + EnterpriseBeanModel<Husky> husky = Util.createEnterpriseBeanModel(Husky.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testSingletonWithSessionScopeFails() + { + EnterpriseBeanModel<IrishTerrier> irishTerrier = Util.createEnterpriseBeanModel(IrishTerrier.class, manager); + } + + @Test + @SpecAssertion(section = "3.3") + public void testSingletonWithApplicationScopeOK() + { + EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testEnterpriseBeanInterceptorFails() + { + EnterpriseBeanModel<Pug> pug = Util.createEnterpriseBeanModel(Pug.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testEnterpriseBeanDecoratorFails() + { + EnterpriseBeanModel<Pekingese> pekingese = Util.createEnterpriseBeanModel(Pekingese.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class, groups = "enterpriseBeans") + @SpecAssertion(section = "3.3") + public void testMultipleAnnotationDefinedEnterpriseBeansWithSameImplementationClassFails() + { + assert false; + } + + @Test(groups = { "webbeansxml", "enterpriseBeans" }) + @SpecAssertion(section = "3.3") + public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassOK() + { + assert false; + } + + + + + @Test(groups="enterpriseBeans") + @SpecAssertion(section = "3.3.1") + public void testAnnotatedEnterpriseBean() + { + assert false; + } + + @Test(groups="enterpriseBeans") + @SpecAssertion(section = "3.3.1") + public void testAnnotatedEnterpriseBeanComplementedWithXML() + { + assert false; + } + + @Test(groups={"enterpriseBeans", "ejbjarxml"}) + @SpecAssertion(section = "3.3.1") + public void testEJBJARDefinedEnterpriseBean() + { + assert false; + } + + @Test(groups={"enterpriseBeans", "ejbjarxml"}) + @SpecAssertion(section = "3.3.1") + public void testEJBJARDefinedEnterpriseBeanComplementedWithXML() + { + assert false; + } + + @Test(groups="enterpriseBeans") + @SpecAssertion(section = "3.3.2") + public void testAPITypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() + { + assert false; + } + + @Test(groups="enterpriseBeans") + @SpecAssertion(section = "3.3.2") + public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInAPITypes() + { + assert false; + } + + @Test + @SpecAssertion(section = "3.3.2") + public void testObjectIsInAPITypes() + { + EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); + assert laika.getApiTypes().contains(Object.class); + } + + @Test(groups="enterpriseBeans") + @SpecAssertion(section = "3.3.2") + public void testRemoteInterfacesAreNotInAPITypes() + { + assert false; + } + + @Test(groups={"enterpriseBeans", "producerMethod", "observerMethod", "renoveMethod", "webbeansxml"}) + @SpecAssertion(section = "3.3.4") + public void testXMLDefinedEnterpriseBeanIgnoresProducerAndDisposalAndObserverAnnotations() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups={"enterpriseBeans", "ejbjarxml", "singletons"}) + @SpecAssertion(section = "3.3.4") + public void testXMLDefinedSingletonsFail() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3") + public void testMessageDrivenBeansNotOK() + { + EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager); + } + + + @Test + @SpecAssertion(section = "3.3.7") + public void testDefaultName() + { + EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); + assert pitbull.getName().equals("pitbull"); + } + +} Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,133 @@ +package org.jboss.webbeans.test.ejb.model; + +import javax.webbeans.DefinitionException; +import javax.webbeans.UnremovedException; + +import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.test.AbstractTest; +import org.jboss.webbeans.test.SpecAssertion; +import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.ejb.model.invalid.Armant; +import org.jboss.webbeans.test.ejb.model.invalid.GoldenRetriever; +import org.jboss.webbeans.test.ejb.model.invalid.JackRussellTerrier; +import org.jboss.webbeans.test.ejb.model.invalid.Poodle; +import org.jboss.webbeans.test.ejb.model.invalid.Pumi; +import org.jboss.webbeans.test.ejb.model.invalid.Rottweiler; +import org.jboss.webbeans.test.ejb.model.invalid.RussellTerrier; +import org.jboss.webbeans.test.ejb.model.invalid.Saluki; +import org.jboss.webbeans.test.ejb.model.invalid.Spitz; +import org.jboss.webbeans.test.ejb.model.invalid.Toller; +import org.jboss.webbeans.test.ejb.model.invalid.WelshCorgie; +import org.jboss.webbeans.test.ejb.model.invalid.Whippet; +import org.jboss.webbeans.test.ejb.model.valid.Laika; +import org.jboss.webbeans.test.ejb.model.valid.Pitbull; +import org.jboss.webbeans.test.util.Util; +import org.testng.annotations.Test; + +@SpecVersion("PDR") +@SuppressWarnings("unused") +public class EnterpriseBeanRemoveMethodTest extends AbstractTest +{ + + @Test + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodInDependentScopeOK() + { + EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodInApplicationScopeFails() + { + EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodInSessionScopeFails() + { + EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodInConversationScopeFails() + { + EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5") + public void testStatefulEnterpriseBeanWithoutRemoveMethodInRequestScopeFails() + { + EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager); + } + + @Test + @SpecAssertion(section = "3.3.5.1") + public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod() + { + EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager); + assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy"); + } + + @Test + @SpecAssertion(section = "3.3.5.1") + public void testAnnotationDefinedEnterpriseBeanWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod() + { + EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); + assert laika.getRemoveMethod() == null; + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testEnterpriseBeanWithMultipleDestructorAnnotationsFail() + { + EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testAnnotationDefinedEnterpriseBeanWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails() + { + EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testAnnotationDefinedEnterpriseBeanWithDestructorWithDisposesParameterFails() + { + EnterpriseBeanModel<Pumi> pumi = Util.createEnterpriseBeanModel(Pumi.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testEnterpriseBeanWithInitializerAnnotationOnRemoveMethodFails() + { + EnterpriseBeanModel<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBeanModel(JackRussellTerrier.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testEnterpriseBeanWithProducerAnnotationOnRemoveMethodFails() + { + EnterpriseBeanModel<RussellTerrier> russellTerrier = Util.createEnterpriseBeanModel(RussellTerrier.class, manager); + } + + @Test(expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.3.5.1") + public void testEnterpriseBeanWithRemoveMethodTakingObserverAnnotatedParameterFails() + { + EnterpriseBeanModel<Toller> toller = Util.createEnterpriseBeanModel(Toller.class, manager); + } + + @Test(expectedExceptions=DefinitionException.class) + public void testStatelessEnterpriseBeansWithDestructorAnnotationFails() + { + EnterpriseBeanModel<WelshCorgie> welshCorgie = Util.createEnterpriseBeanModel(WelshCorgie.class, manager); + } + + + +} Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,95 @@ +package org.jboss.webbeans.test.ejb.model; + +import javax.webbeans.DefinitionException; +import javax.webbeans.DeploymentException; + +import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.test.AbstractTest; +import org.jboss.webbeans.test.SpecAssertion; +import org.jboss.webbeans.test.SpecVersion; +import org.jboss.webbeans.test.ejb.model.valid.GreaterDane; +import org.jboss.webbeans.test.ejb.model.valid.Hound; +import org.jboss.webbeans.test.ejb.model.valid.HoundOfBaskerville; +import org.jboss.webbeans.test.util.Util; +import org.testng.annotations.Test; + +@SpecVersion("PDR") +@SuppressWarnings("unused") +public class EnterpriseBeanSpecializationTest extends AbstractTest +{ + @Test(groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testSpecializingBeanInheritsBindingTypes() + { + EnterpriseBeanModel<Hound> hound = Util.createEnterpriseBeanModel(Hound.class, manager); + EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager); + assert compareBindingTypesOK(hound, houndOfBaskerville); + } + + private boolean compareBindingTypesOK(EnterpriseBeanModel<Hound> hound, + EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville) + { + if (hound.getBindingTypes().size() != houndOfBaskerville.getBindingTypes().size()) { + return false; + } + if (!hound.getBindingTypes().containsAll(houndOfBaskerville.getBindingTypes())) { + return false; + } + if (!houndOfBaskerville.getBindingTypes().containsAll(hound.getBindingTypes())) { + return false; + } + return true; + } + + @Test(groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testSpecializingBeanInheritsNameIfAny() + { + EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager); + assert houndOfBaskerville.getName().equals("Pongo"); + } + + @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testSpecializingNotSupportingLocalInterfacesOfSpecializedFails() + { + assert false; + } + + @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testSpecializingNotSupportingLocalViewOfSpecializedFails() + { + assert false; + } + + @Test(groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testXMLDefinedSpecializationOnAnnotationDefinedBean() + { + assert false; + } + + + @Test(expectedExceptions = DeploymentException.class, groups={"enterpriseBeans", "specialization"}) + @SpecAssertion(section = "3.3") + public void testMultipleEnabledSpecializedEnterpriseBeanFails() + { + assert false; + } + + @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testAnnotationDefinedSpecializingEnterpriseBeanNotDirectlyExtendingAnnotationDefinedEnterpriseBeanFails() + { + EnterpriseBeanModel<GreaterDane> greaterDane = Util.createEnterpriseBeanModel(GreaterDane.class, manager); + } + + @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) + @SpecAssertion(section = "3.3.6") + public void testXMLDefinedSpecializingEnterpriseBeanNotImplementingAnnotationDefinedEnterpriseBeanFails() + { + assert false; + } + +} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Armant.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Armant.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Armant.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +public class Armant +{ + @Remove + public void destroy() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Armant.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Beagle.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Beagle.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Beagle.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Beagle.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.RequestScoped; + +@Stateless +@RequestScoped +public class Beagle +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Beagle.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Boxer.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Boxer.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Boxer.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Boxer.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.ConversationScoped; + +@Stateless +@ConversationScoped +public class Boxer +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Boxer.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Bullmastiff.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Bullmastiff.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Bullmastiff.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Bullmastiff.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.SessionScoped; + +@Stateless +@SessionScoped +public class Bullmastiff +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Bullmastiff.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Dachshund.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dachshund.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Dachshund.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Dachshund.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.ApplicationScoped; + +@Stateless +@ApplicationScoped +public class Dachshund +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Dachshund.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/GoldenRetriever.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/GoldenRetriever.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/GoldenRetriever.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.Destructor; + +@Stateful +public class GoldenRetriever +{ + @Destructor + public void destroy() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/GoldenRetriever.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Greyhound.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Greyhound.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Greyhound.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Greyhound.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.webbeans.RequestScoped; + +import org.jboss.webbeans.test.annotations.Singleton; + +@Singleton +@RequestScoped +public class Greyhound +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Greyhound.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Husky.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Husky.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Husky.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Husky.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.webbeans.ConversationScoped; + +import org.jboss.webbeans.test.annotations.Singleton; + +@Singleton +@ConversationScoped +public class Husky +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Husky.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/IrishTerrier.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/IrishTerrier.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/IrishTerrier.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/IrishTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.webbeans.SessionScoped; + +import org.jboss.webbeans.test.annotations.Singleton; + +@Singleton +@SessionScoped +public class IrishTerrier +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/IrishTerrier.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/JackRussellTerrier.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JackRussellTerrier.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/JackRussellTerrier.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/JackRussellTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Initializer; + +@Stateful +public class JackRussellTerrier +{ + @Remove + @Initializer + public void destroy() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/JackRussellTerrier.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pekingese.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pekingese.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pekingese.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pekingese.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.Decorator; + +@Stateless +@Decorator +public class Pekingese +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pekingese.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Poodle.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Poodle.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Poodle.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.ApplicationScoped; + +@Stateful +@ApplicationScoped +public class Poodle +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Poodle.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pug.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pug.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pug.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pug.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.Interceptor; + +@Stateless +@Interceptor +public class Pug +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pug.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pumi.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pumi.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pumi.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pumi.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,17 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Disposes; + +import org.jboss.webbeans.test.annotations.Tame; +import org.jboss.webbeans.test.beans.Horse; + +@Stateful +public class Pumi +{ + @Remove + public void destroy(@Disposes @Tame Horse horse) { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Pumi.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RequestScopedStateless.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RequestScopedStateless.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RequestScopedStateless.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RequestScopedStateless.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.RequestScoped; + +@RequestScoped +@Stateless +public class RequestScopedStateless +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RequestScopedStateless.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Rottweiler.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Rottweiler.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Rottweiler.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.SessionScoped; + +@Stateful +@SessionScoped +public class Rottweiler +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Rottweiler.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RussellTerrier.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/RussellTerrier.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RussellTerrier.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RussellTerrier.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Produces; + +@Stateful +public class RussellTerrier +{ + @Remove + @Produces + public void destroy() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/RussellTerrier.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Saluki.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Saluki.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Saluki.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.RequestScoped; + +@Stateful +@RequestScoped +public class Saluki +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Saluki.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Spitz.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Spitz.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Spitz.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.ConversationScoped; + +@Stateful +@ConversationScoped +public class Spitz +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Spitz.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Toller.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Toller.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Toller.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Toller.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,17 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Observes; + +import org.jboss.webbeans.test.annotations.Tame; +import org.jboss.webbeans.test.beans.Horse; + +@Stateful +public class Toller +{ + @Remove + public void destroy(@Observes @Tame Horse horse) { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Toller.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/WelshCorgie.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/WelshCorgie.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/WelshCorgie.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/WelshCorgie.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateless; +import javax.webbeans.Destructor; + +@Stateless +public class WelshCorgie +{ + @Destructor + public void destroy() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/WelshCorgie.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Whippet.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Whippet.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Whippet.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.ejb.model.invalid; + +import javax.ejb.Stateful; +import javax.webbeans.Destructor; + +@Stateful +public class Whippet +{ + @Destructor + public void destroy1() { + + } + + @Destructor + public void destroy2() { + + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/invalid/Whippet.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreatDane.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreatDane.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreatDane.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreatDane.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.test.ejb.model.valid; + + +public class GreatDane +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreatDane.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreaterDane.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/GreaterDane.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreaterDane.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreaterDane.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.valid; + +import javax.ejb.Stateless; +import javax.webbeans.Specializes; + +@Specializes +@Stateless +public class GreaterDane extends GreatDane +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/GreaterDane.java ___________________________________________________________________ Name: svn:mergeinfo + Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Hound.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Hound.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Hound.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.ejb.model.valid; + +import javax.ejb.Stateful; +import javax.webbeans.Named; + +import org.jboss.webbeans.test.annotations.Tame; + +@Stateful +@Tame +@Named("Pongo") +public class Hound +{ + +} Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/HoundOfBaskerville.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/HoundOfBaskerville.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/HoundOfBaskerville.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.valid; + +import javax.ejb.Stateful; +import javax.webbeans.Specializes; + +@Specializes +@Stateful +public class HoundOfBaskerville extends Hound +{ + +} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Laika.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Laika.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Laika.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Laika.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.ejb.model.valid; + +import javax.webbeans.ApplicationScoped; + +import org.jboss.webbeans.test.annotations.Singleton; + +@Singleton +@ApplicationScoped +public class Laika +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Laika.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Pitbull.java (from rev 254, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Pitbull.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Pitbull.java 2008-11-06 11:55:14 UTC (rev 257) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.ejb.model.valid; + +import javax.ejb.Stateful; +import javax.webbeans.Named; + +@Stateful +@Named +public class Pitbull +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/valid/Pitbull.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-06 11:55:14 UTC (rev 257) @@ -29,7 +29,7 @@ public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl manager) { - return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), getEmptyAnnotatedType(clazz), manager); + return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), null, manager); } public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager) Modified: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2008-11-06 11:52:38 UTC (rev 256) +++ ri/trunk/webbeans-ri/testng.xml 2008-11-06 11:55:14 UTC (rev 257) @@ -32,6 +32,8 @@ </groups> <packages> <package name="org.jboss.webbeans.test"></package> + <package name="org.jboss.webbeans.test.ejb.lifecycle"></package> + <package name="org.jboss.webbeans.test.ejb.model"></package> </packages> </test>