[weld-commits] Weld SVN: r4552 - in api/trunk/weld-spi/src: test/java/org/jboss/weld/bootstrap/api/test and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2009-11-02 15:16:18 -0500 (Mon, 02 Nov 2009) New Revision: 4552 Added: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java Modified: api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java Log: WELD-92 Modified: api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java =================================================================== --- api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-11-02 20:13:10 UTC (rev 4551) +++ api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-11-02 20:16:18 UTC (rev 4552) @@ -25,6 +25,7 @@ import org.jboss.weld.injection.spi.JpaInjectionServices; import org.jboss.weld.injection.spi.ResourceInjectionServices; import org.jboss.weld.resources.spi.ResourceLoader; +import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory; import org.jboss.weld.security.spi.SecurityServices; import org.jboss.weld.servlet.api.ServletServices; import org.jboss.weld.transaction.spi.TransactionServices; @@ -54,6 +55,7 @@ .addRequiredDeploymentService(ValidationServices.class) .addRequiredDeploymentService(ServletServices.class) .addRequiredDeploymentService(EjbServices.class) + .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class) .addRequiredBeanDeploymentArchiveService(JpaInjectionServices.class) .addRequiredBeanDeploymentArchiveService(ResourceInjectionServices.class) .addRequiredBeanDeploymentArchiveService(EjbInjectionServices.class) @@ -74,6 +76,7 @@ .addRequiredDeploymentService(ValidationServices.class) .addRequiredDeploymentService(ServletServices.class) .addRequiredDeploymentService(EjbServices.class) + .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class) .addRequiredBeanDeploymentArchiveService(InjectionServices.class) ), @@ -85,12 +88,15 @@ SERVLET(new EnvironmentBuilder() .addRequiredDeploymentService(ResourceLoader.class) .addRequiredDeploymentService(ServletServices.class) + .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class) ), /** * Java SE */ SE(new EnvironmentBuilder() + .addRequiredDeploymentService(ResourceLoader.class) + .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class) ); private final Set<Class<? extends Service>> requiredDeploymentServices; Modified: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java =================================================================== --- api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-11-02 20:13:10 UTC (rev 4551) +++ api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-11-02 20:16:18 UTC (rev 4552) @@ -11,6 +11,7 @@ import org.jboss.weld.injection.spi.JpaInjectionServices; import org.jboss.weld.injection.spi.ResourceInjectionServices; import org.jboss.weld.resources.spi.ResourceLoader; +import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory; import org.jboss.weld.security.spi.SecurityServices; import org.jboss.weld.servlet.api.ServletServices; import org.jboss.weld.transaction.spi.TransactionServices; @@ -31,6 +32,7 @@ deploymentServices.add(SecurityServices.class, new MockSecurityServices()); deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); bdaServices.add(JpaInjectionServices.class, new MockJpaServices()); bdaServices.add(ResourceInjectionServices.class, new MockResourceServices()); @@ -51,6 +53,7 @@ deploymentServices.add(SecurityServices.class, new MockSecurityServices()); deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); bdaServices.add(JpaInjectionServices.class, new MockJpaServices()); bdaServices.add(ResourceInjectionServices.class, new MockResourceServices()); @@ -70,6 +73,7 @@ deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); @@ -91,6 +95,7 @@ deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); @@ -112,6 +117,7 @@ deploymentServices.add(SecurityServices.class, new MockSecurityServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); @@ -133,6 +139,7 @@ deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); @@ -153,6 +160,7 @@ deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); @@ -174,6 +182,7 @@ deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(ServletServices.class, new MockServletServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); @@ -193,6 +202,7 @@ deploymentServices.add(SecurityServices.class, new MockSecurityServices()); deploymentServices.add(ValidationServices.class, new MockValidationServices()); deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); @@ -202,6 +212,27 @@ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices)); bootstrap.startContainer(Environments.EE_INJECT, deployment, null); } + + @Test(expectedExceptions = IllegalStateException.class) + public void testMissingScheduledExecutorServiceFactory() + { + Bootstrap bootstrap = new MockBootstrap(); + ServiceRegistry deploymentServices = new SimpleServiceRegistry(); + deploymentServices.add(ResourceLoader.class, new MockResourceLoader()); + deploymentServices.add(TransactionServices.class, new MockTransactionServices()); + deploymentServices.add(SecurityServices.class, new MockSecurityServices()); + deploymentServices.add(ValidationServices.class, new MockValidationServices()); + deploymentServices.add(EjbServices.class, new MockEjbServices()); + deploymentServices.add(ServletServices.class, new MockServletServices()); + + ServiceRegistry bdaServices = new SimpleServiceRegistry(); + bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices()); + bdaServices.add(JpaInjectionServices.class, new MockJpaServices()); + bdaServices.add(ResourceInjectionServices.class, new MockResourceServices()); + + Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices)); + bootstrap.startContainer(Environments.EE_INJECT, deployment, null); + } @Test public void testSEEnv() @@ -209,6 +240,7 @@ Bootstrap bootstrap = new MockBootstrap(); ServiceRegistry deploymentServices = new SimpleServiceRegistry(); deploymentServices.add(ResourceLoader.class, new MockResourceLoader()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices)); bootstrap.startContainer(Environments.SE, deployment, null); @@ -221,6 +253,7 @@ ServiceRegistry deploymentServices = new SimpleServiceRegistry(); deploymentServices.add(ResourceLoader.class, new MockResourceLoader()); deploymentServices.add(ServletServices.class, new MockServletServices()); + deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory()); ServiceRegistry bdaServices = new SimpleServiceRegistry(); Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices)); bootstrap.startContainer(Environments.SERVLET, deployment, null); Added: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java =================================================================== --- api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java (rev 0) +++ api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java 2009-11-02 20:16:18 UTC (rev 4552) @@ -0,0 +1,22 @@ +package org.jboss.weld.bootstrap.api.test; + +import java.util.concurrent.ScheduledExecutorService; + +import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory; + +public class MockScheduledExecutorServiceFactory implements ScheduledExecutorServiceFactory +{ + + public ScheduledExecutorService get() + { + // TODO Auto-generated method stub + return null; + } + + public void cleanup() + { + // TODO Auto-generated method stub + + } + +} Property changes on: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java ___________________________________________________________________ Name: svn:eol-style + native