[webbeans-commits] Webbeans SVN: r273 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test/ejb/model and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2008-11-07 12:30:37 -0500 (Fri, 07 Nov 2008) New Revision: 273 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 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/util/Util.java Log: Switch enterprise tests to use Bean, not Model Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-11-07 10:28:31 UTC (rev 272) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-11-07 17:30:37 UTC (rev 273) @@ -58,6 +58,12 @@ { injectableField.inject(instance, manager); } - } + } + + public InjectableMethod<?> getRemoveMethod() + { + return model.getRemoveMethod(); + + } } Modified: 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 2008-11-07 10:28:31 UTC (rev 272) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanDeclarationTest.java 2008-11-07 17:30:37 UTC (rev 273) @@ -2,7 +2,7 @@ import javax.webbeans.DefinitionException; -import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; @@ -32,84 +32,84 @@ @SpecAssertion(section = "3.3") public void testStatelessWithDependentScopeOK() { - EnterpriseBeanModel<Giraffe> giraffe = Util.createEnterpriseBeanModel(Giraffe.class, manager); + EnterpriseBean<Giraffe> giraffe = Util.createEnterpriseBean(Giraffe.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testStatelessWithRequestScopeFails() { - EnterpriseBeanModel<Beagle> beagle = Util.createEnterpriseBeanModel(Beagle.class, manager); + EnterpriseBean<Beagle> beagle = Util.createEnterpriseBean(Beagle.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testStatelessWithConversationScopeFails() { - EnterpriseBeanModel<Boxer> boxer = Util.createEnterpriseBeanModel(Boxer.class, manager); + EnterpriseBean<Boxer> boxer = Util.createEnterpriseBean(Boxer.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testStatelessWithSessionScopeFails() { - EnterpriseBeanModel<Bullmastiff> boxer = Util.createEnterpriseBeanModel(Bullmastiff.class, manager); + EnterpriseBean<Bullmastiff> boxer = Util.createEnterpriseBean(Bullmastiff.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testStatelessWithApplicationScopeFails() { - EnterpriseBeanModel<Dachshund> dachshund = Util.createEnterpriseBeanModel(Dachshund.class, manager); + EnterpriseBean<Dachshund> dachshund = Util.createEnterpriseBean(Dachshund.class, manager); } @Test @SpecAssertion(section = "3.3") public void testSingletonWithDependentScopeOK() { - EnterpriseBeanModel<GreatDane> greatDane = Util.createEnterpriseBeanModel(GreatDane.class, manager); + EnterpriseBean<GreatDane> greatDane = Util.createEnterpriseBean(GreatDane.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testSingletonWithRequestScopeFails() { - EnterpriseBeanModel<Greyhound> greyhound = Util.createEnterpriseBeanModel(Greyhound.class, manager); + EnterpriseBean<Greyhound> greyhound = Util.createEnterpriseBean(Greyhound.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testSingletonWithConversationScopeFails() { - EnterpriseBeanModel<Husky> husky = Util.createEnterpriseBeanModel(Husky.class, manager); + EnterpriseBean<Husky> husky = Util.createEnterpriseBean(Husky.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testSingletonWithSessionScopeFails() { - EnterpriseBeanModel<IrishTerrier> irishTerrier = Util.createEnterpriseBeanModel(IrishTerrier.class, manager); + EnterpriseBean<IrishTerrier> irishTerrier = Util.createEnterpriseBean(IrishTerrier.class, manager); } @Test @SpecAssertion(section = "3.3") public void testSingletonWithApplicationScopeOK() { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); + EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testEnterpriseBeanInterceptorFails() { - EnterpriseBeanModel<Pug> pug = Util.createEnterpriseBeanModel(Pug.class, manager); + EnterpriseBean<Pug> pug = Util.createEnterpriseBean(Pug.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3") public void testEnterpriseBeanDecoratorFails() { - EnterpriseBeanModel<Pekingese> pekingese = Util.createEnterpriseBeanModel(Pekingese.class, manager); + EnterpriseBean<Pekingese> pekingese = Util.createEnterpriseBean(Pekingese.class, manager); } @Test(expectedExceptions = DefinitionException.class, groups = "enterpriseBeans") @@ -175,8 +175,8 @@ @SpecAssertion(section = "3.3.2") public void testObjectIsInAPITypes() { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); - assert laika.getApiTypes().contains(Object.class); + EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager); + assert laika.getTypes().contains(Object.class); } @Test(groups="enterpriseBeans") @@ -204,7 +204,7 @@ @SpecAssertion(section = "3.3") public void testMessageDrivenBeansNotOK() { - EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager); + EnterpriseBean<Leopard> Leopard = Util.createEnterpriseBean(Leopard.class, manager); } @@ -212,7 +212,7 @@ @SpecAssertion(section = "3.3.7") public void testDefaultName() { - EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); + EnterpriseBean<Pitbull> pitbull = Util.createEnterpriseBean(Pitbull.class, manager); assert pitbull.getName().equals("pitbull"); } Modified: 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 2008-11-07 10:28:31 UTC (rev 272) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-11-07 17:30:37 UTC (rev 273) @@ -1,9 +1,8 @@ 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.bean.EnterpriseBean; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; @@ -33,42 +32,42 @@ @SpecAssertion(section = "3.3.5") public void testStatefulEnterpriseBeanWithoutRemoveMethodInDependentScopeOK() { - EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager); + EnterpriseBean<Pitbull> pitbull = Util.createEnterpriseBean(Pitbull.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5") public void testStatefulEnterpriseBeanWithoutRemoveMethodInApplicationScopeFails() { - EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager); + EnterpriseBean<Poodle> poodle = Util.createEnterpriseBean(Poodle.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5") public void testStatefulEnterpriseBeanWithoutRemoveMethodInSessionScopeFails() { - EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager); + EnterpriseBean<Rottweiler> rottweiler = Util.createEnterpriseBean(Rottweiler.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5") public void testStatefulEnterpriseBeanWithoutRemoveMethodInConversationScopeFails() { - EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager); + EnterpriseBean<Spitz> spitz = Util.createEnterpriseBean(Spitz.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5") public void testStatefulEnterpriseBeanWithoutRemoveMethodInRequestScopeFails() { - EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager); + EnterpriseBean<Saluki> saluki = Util.createEnterpriseBean(Saluki.class, manager); } @Test @SpecAssertion(section = "3.3.5.1") public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod() { - EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager); + EnterpriseBean<Armant> whippet = Util.createEnterpriseBean(Armant.class, manager); assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy"); } @@ -76,7 +75,7 @@ @SpecAssertion(section = "3.3.5.1") public void testAnnotationDefinedEnterpriseBeanWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod() { - EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager); + EnterpriseBean<Laika> laika = Util.createEnterpriseBean(Laika.class, manager); assert laika.getRemoveMethod() == null; } @@ -84,48 +83,48 @@ @SpecAssertion(section = "3.3.5.1") public void testEnterpriseBeanWithMultipleDestructorAnnotationsFail() { - EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager); + EnterpriseBean<Whippet> whippet = Util.createEnterpriseBean(Whippet.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5.1") public void testAnnotationDefinedEnterpriseBeanWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails() { - EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager); + EnterpriseBean<GoldenRetriever> goldenRetriever = Util.createEnterpriseBean(GoldenRetriever.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5.1") public void testAnnotationDefinedEnterpriseBeanWithDestructorWithDisposesParameterFails() { - EnterpriseBeanModel<Pumi> pumi = Util.createEnterpriseBeanModel(Pumi.class, manager); + EnterpriseBean<Pumi> pumi = Util.createEnterpriseBean(Pumi.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5.1") public void testEnterpriseBeanWithInitializerAnnotationOnRemoveMethodFails() { - EnterpriseBeanModel<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBeanModel(JackRussellTerrier.class, manager); + EnterpriseBean<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBean(JackRussellTerrier.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5.1") public void testEnterpriseBeanWithProducerAnnotationOnRemoveMethodFails() { - EnterpriseBeanModel<RussellTerrier> russellTerrier = Util.createEnterpriseBeanModel(RussellTerrier.class, manager); + EnterpriseBean<RussellTerrier> russellTerrier = Util.createEnterpriseBean(RussellTerrier.class, manager); } @Test(expectedExceptions = DefinitionException.class) @SpecAssertion(section = "3.3.5.1") public void testEnterpriseBeanWithRemoveMethodTakingObserverAnnotatedParameterFails() { - EnterpriseBeanModel<Toller> toller = Util.createEnterpriseBeanModel(Toller.class, manager); + EnterpriseBean<Toller> toller = Util.createEnterpriseBean(Toller.class, manager); } @Test(expectedExceptions=DefinitionException.class) public void testStatelessEnterpriseBeansWithDestructorAnnotationFails() { - EnterpriseBeanModel<WelshCorgie> welshCorgie = Util.createEnterpriseBeanModel(WelshCorgie.class, manager); + EnterpriseBean<WelshCorgie> welshCorgie = Util.createEnterpriseBean(WelshCorgie.class, manager); } Modified: 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 2008-11-07 10:28:31 UTC (rev 272) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanSpecializationTest.java 2008-11-07 17:30:37 UTC (rev 273) @@ -3,7 +3,7 @@ import javax.webbeans.DefinitionException; import javax.webbeans.DeploymentException; -import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.test.AbstractTest; import org.jboss.webbeans.test.SpecAssertion; import org.jboss.webbeans.test.SpecVersion; @@ -21,13 +21,13 @@ @SpecAssertion(section = "3.3.6") public void testSpecializingBeanInheritsBindingTypes() { - EnterpriseBeanModel<Hound> hound = Util.createEnterpriseBeanModel(Hound.class, manager); - EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager); + EnterpriseBean<Hound> hound = Util.createEnterpriseBean(Hound.class, manager); + EnterpriseBean<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBean(HoundOfBaskerville.class, manager); assert compareBindingTypesOK(hound, houndOfBaskerville); } - private boolean compareBindingTypesOK(EnterpriseBeanModel<Hound> hound, - EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville) + private boolean compareBindingTypesOK(EnterpriseBean<Hound> hound, + EnterpriseBean<HoundOfBaskerville> houndOfBaskerville) { if (hound.getBindingTypes().size() != houndOfBaskerville.getBindingTypes().size()) { return false; @@ -45,7 +45,7 @@ @SpecAssertion(section = "3.3.6") public void testSpecializingBeanInheritsNameIfAny() { - EnterpriseBeanModel<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBeanModel(HoundOfBaskerville.class, manager); + EnterpriseBean<HoundOfBaskerville> houndOfBaskerville = Util.createEnterpriseBean(HoundOfBaskerville.class, manager); assert houndOfBaskerville.getName().equals("Pongo"); } @@ -82,7 +82,7 @@ @SpecAssertion(section = "3.3.6") public void testAnnotationDefinedSpecializingEnterpriseBeanNotDirectlyExtendingAnnotationDefinedEnterpriseBeanFails() { - EnterpriseBeanModel<GreaterDane> greaterDane = Util.createEnterpriseBeanModel(GreaterDane.class, manager); + EnterpriseBean<GreaterDane> greaterDane = Util.createEnterpriseBean(GreaterDane.class, manager); } @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"}) 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-07 10:28:31 UTC (rev 272) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-07 17:30:37 UTC (rev 273) @@ -24,7 +24,7 @@ return new SimpleBean<T>(createSimpleModel(clazz, manager), manager); } - public static <T> EnterpriseBean<T> createSimpleEnterpriseBean(Class<T> clazz, ManagerImpl manager) + public static <T> EnterpriseBean<T> createEnterpriseBean(Class<T> clazz, ManagerImpl manager) { return new EnterpriseBean<T>(createEnterpriseBeanModel(clazz, manager), manager); } @@ -39,12 +39,12 @@ return new SimpleBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager); } - public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl manager) + private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, ManagerImpl 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) + private static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> clazz, AnnotatedClass<T> xmlAnnotatedType, ManagerImpl manager) { return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager); }