[weld-commits] Weld SVN: r4531 - in core/trunk/tests/src: test/java/org/jboss/weld/test/unit/deployment/structure/extensions and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2009-11-01 17:36:39 -0500 (Sun, 01 Nov 2009) New Revision: 4531 Added: core/trunk/tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java core/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBDAExtensionTest.java Log: tidy up Added: core/trunk/tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java =================================================================== --- core/trunk/tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java (rev 0) +++ core/trunk/tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java 2009-11-01 22:36:39 UTC (rev 4531) @@ -0,0 +1,33 @@ +package org.jboss.weld.mock; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.weld.bootstrap.api.ServiceRegistry; +import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry; +import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; +import org.jboss.weld.bootstrap.spi.Deployment; + +public abstract class AbstractMockDeployment implements Deployment +{ + + private final List<BeanDeploymentArchive> beanDeploymentArchives; + private final ServiceRegistry services; + + public AbstractMockDeployment(BeanDeploymentArchive... beanDeploymentArchives) + { + this.services = new SimpleServiceRegistry(); + this.beanDeploymentArchives = Arrays.asList(beanDeploymentArchives); + } + + public List<BeanDeploymentArchive> getBeanDeploymentArchives() + { + return beanDeploymentArchives; + } + + public ServiceRegistry getServices() + { + return services; + } + +} \ No newline at end of file Property changes on: core/trunk/tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java =================================================================== --- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java 2009-11-01 22:26:59 UTC (rev 4530) +++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java 2009-11-01 22:36:39 UTC (rev 4531) @@ -18,6 +18,7 @@ import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -54,10 +55,10 @@ this("test"); } - public MockBeanDeploymentArchive(String id) + public MockBeanDeploymentArchive(String id, Class<?> ... classes) { this.services = new SimpleServiceRegistry(); - this.beanClasses = new HashSet<Class<?>>(); + this.beanClasses = Arrays.asList(classes); this.beansXmlFiles = new HashSet<URL>(); this.bdas = new HashSet<BeanDeploymentArchive>(); this.id = id; Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java =================================================================== --- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java 2009-11-01 22:26:59 UTC (rev 4530) +++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java 2009-11-01 22:36:39 UTC (rev 4531) @@ -16,34 +16,19 @@ */ package org.jboss.weld.mock; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.weld.bootstrap.api.ServiceRegistry; -import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry; import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; -import org.jboss.weld.bootstrap.spi.Deployment; -public class MockDeployment implements Deployment +public class MockDeployment extends AbstractMockDeployment { private final MockBeanDeploymentArchive archive; - private final List<BeanDeploymentArchive> beanDeploymentArchives; - private final ServiceRegistry services; public MockDeployment() { this.archive = new MockBeanDeploymentArchive(); - this.services = new SimpleServiceRegistry(); - this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>(); - this.beanDeploymentArchives.add(archive); + getBeanDeploymentArchives().add(archive); } - public List<BeanDeploymentArchive> getBeanDeploymentArchives() - { - return beanDeploymentArchives; - } - public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) { return archive; @@ -54,9 +39,4 @@ return archive; } - public ServiceRegistry getServices() - { - return services; - } - } Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBDAExtensionTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBDAExtensionTest.java 2009-11-01 22:26:59 UTC (rev 4530) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBDAExtensionTest.java 2009-11-01 22:36:39 UTC (rev 4531) @@ -1,18 +1,14 @@ package org.jboss.weld.test.unit.deployment.structure.extensions; -import java.util.ArrayList; -import java.util.Collection; - import javax.enterprise.inject.spi.Extension; import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bootstrap.WeldBootstrap; import org.jboss.weld.bootstrap.api.Environments; -import org.jboss.weld.bootstrap.api.ServiceRegistry; -import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry; import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; import org.jboss.weld.bootstrap.spi.Deployment; import org.jboss.weld.context.beanstore.HashMapBeanStore; +import org.jboss.weld.mock.AbstractMockDeployment; import org.jboss.weld.mock.MockBeanDeploymentArchive; import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory; import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory; @@ -27,25 +23,16 @@ WeldBootstrap bootstrap = new WeldBootstrap(); // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar - final BeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1"); - bda1.getBeanClasses().add(Observer1.class); - bda1.getBeanClasses().add(Foo.class); + final BeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", Observer1.class, Foo.class); // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension - final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2"); - bda2.getBeanClasses().add(Observer2.class); + final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", Observer2.class); - // Create the Collection of BDAs to deploy - final Collection<BeanDeploymentArchive> deployedBdas = new ArrayList<BeanDeploymentArchive>(); - deployedBdas.add(bda1); - // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside - Deployment deployment = new Deployment() + Deployment deployment = new AbstractMockDeployment(bda1) { - private ServiceRegistry serviceRegistry = new SimpleServiceRegistry(); - public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) { // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1 @@ -60,16 +47,7 @@ return bda1; } } - - public ServiceRegistry getServices() - { - return serviceRegistry; - } - - public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() - { - return deployedBdas; - } + }; Added: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-01 22:36:39 UTC (rev 4531) @@ -0,0 +1,90 @@ +package org.jboss.weld.test.unit.deployment.structure.extensions; + +import javax.enterprise.inject.spi.Extension; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bootstrap.WeldBootstrap; +import org.jboss.weld.bootstrap.api.Environments; +import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; +import org.jboss.weld.bootstrap.spi.Deployment; +import org.jboss.weld.context.beanstore.HashMapBeanStore; +import org.jboss.weld.mock.AbstractMockDeployment; +import org.jboss.weld.mock.MockBeanDeploymentArchive; +import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory; +import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory; +import org.testng.annotations.Test; + +public class NonBDAExtensionTest +{ + + @Test(description="WELD-233") + public void test() + { + WeldBootstrap bootstrap = new WeldBootstrap(); + + // Create the BDA in which we will deploy Observer1 and Foo. This is equivalent to a war or ejb jar + final BeanDeploymentArchive bda1 = new MockBeanDeploymentArchive("1", Observer1.class, Foo.class); + + // Create the BDA to return from loadBeanDeploymentArchive for Observer2, this is probably a library, though could be another war or ejb jar + // bda2 is accessible from bda1, but isn't added to it's accessibility graph by default. This similar to an archive which doesn't contain a beans.xml but does contain an extension + final BeanDeploymentArchive bda2 = new MockBeanDeploymentArchive("2", Observer2.class); + + // Create a deployment, that we can use to mirror the structure of one Extension inside a BDA, and one outside + Deployment deployment = new AbstractMockDeployment(bda1) + { + + public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) + { + // Return bda2 if it is Observer2. Stick anything else which this test isn't about in bda1 + if (beanClass.equals(Observer2.class)) + { + // If Observer2 is requested, then we need to add bda2 to the accessibility graph of bda1 + bda1.getBeanDeploymentArchives().add(bda2); + return bda2; + } + else + { + return bda1; + } + } + + }; + + + // Initialize the container, we use the SE env as we aren't going to interact with the servlet lifecycle really + bootstrap.startContainer(Environments.SE, deployment, new HashMapBeanStore()); + + // Add custom ServiceLoader so that we can load Extension services from current package, not META-INF/services + // We do this after startContainer() so we replace the default impl + deployment.getServices().add(ServiceLoaderFactory.class, new PackageServiceLoaderFactory(NonBDAExtensionTest.class.getPackage(), Extension.class)); + + // Cause the container to deploy the beans etc. + bootstrap.startInitialization().deployBeans().validateBeans().endInitialization(); + + // Get the bean manager for bda1 and bda2 + BeanManagerImpl beanManager1 = bootstrap.getManager(bda1); + BeanManagerImpl beanManager2 = bootstrap.getManager(bda2); + + Observer1 observer1 = beanManager1.getInstanceByType(Observer1.class); + assert observer1.isBeforeBeanDiscoveryCalled(); + assert observer1.isAfterBeanDiscoveryCalled(); + assert observer1.isAfterDeploymentValidationCalled(); + assert observer1.isProcessInjectionTargetCalled(); + assert observer1.isProcessManagedBeanCalled(); + assert observer1.isProcessProducerCalled(); + + assert beanManager2.getBeans(Observer2.class).size() == 1; + // Also check that the accessibility graph has been updated + assert beanManager1.getBeans(Observer2.class).size() == 1; + + Observer2 observer2 = beanManager2.getInstanceByType(Observer2.class); + assert observer2.isBeforeBeanDiscoveryCalled(); + assert observer2.isAfterBeanDiscoveryCalled(); + assert observer2.isAfterDeploymentValidationCalled(); + assert observer2.isProcessInjectionTargetCalled(); + assert observer2.isProcessManagedBeanCalled(); + assert observer2.isProcessProducerCalled(); + + } + +}