WELD-220

weld · Oct 29, 2009 · 68fc9c8 · 68fc9c8
1 parent 8a202e3
commit 68fc9c8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java b/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java
@@ -79,7 +79,7 @@ protected MockDeployment getDeployment()
       return deployment;
    }
 
-   protected WeldBootstrap getBootstrap()
+   public WeldBootstrap getBootstrap()
    {
       return bootstrap;
    }

diff --git a/tests/src/main/java/org/jboss/weld/mock/TestContainer.java b/tests/src/main/java/org/jboss/weld/mock/TestContainer.java
@@ -8,6 +8,19 @@
 /**
  * Control of the container, used for tests. Wraps up common operations.
  * 
+ * If you require more control over the container bootstrap lifecycle you should
+ * use the {@link #getLifecycle()} method. For example:
+ * 
+ * <code>TestContainer container = new TestContainer(...);
+ * container.getLifecycle().initialize();
+ * container.getLifecycle().getBootstrap().startInitialization();
+ * container.getLifecycle().getBootstrap().deployBeans();
+ * container.getLifecycle().getBootstrap().validateBeans();
+ * container.getLifecycle().getBootstrap().endInitialization();
+ * container.getLifecycle().stopContainer();</code>
+ * 
+ * Note that we can easily mix fine-grained calls to bootstrap, and coarse grained calls to {@link TestContainer}.
+ * 
  * @author pmuir
  *
  */
@@ -52,6 +65,7 @@ public TestContainer(MockServletLifecycle lifecycle, Collection<Class<?>> classe
       this.lifecycle = lifecycle;
       this.classes = classes;
       this.beansXml = beansXml;
+      configureArchive();
    }
 
    /**
@@ -77,35 +91,21 @@ public Status startContainerAndReturnStatus()
     */
    public void startContainer()
    {
-      startContainer(true);
+      getLifecycle().initialize();
+      getLifecycle().beginApplication();
    }
 
    /**
-    * Starts the container
-    * @param beginApplication whether or not beginApplication() should be called
+    * Configure's the archive with the classes and beans.xml
     */
-   public void startContainer(boolean beginApplication)
+   protected void configureArchive()
    {
       MockBeanDeploymentArchive archive = lifecycle.getDeployment().getArchive();
       archive.setBeanClasses(classes);
       if (beansXml != null)
       {
          archive.setBeansXmlFiles(beansXml);
       }
-      lifecycle.initialize();
-      if (beginApplication)
-      {
-         beginApplication();
-      }
-   }
-
-   /**
-    * Deploys the application. Intended use is in conjunction with {@link #startContainer(boolean)}.
-    * {@link #startContainer()} does this step automatically 
-    */
-   public void beginApplication()
-   {
-      lifecycle.beginApplication();
    }
 
    /**
@@ -120,12 +120,12 @@ public MockServletLifecycle getLifecycle()
 
    public BeanManagerImpl getBeanManager()
    {
-      return lifecycle.getBootstrap().getManager(getDeployment().getArchive());
+      return getLifecycle().getBootstrap().getManager(getDeployment().getArchive());
    }
 
    public MockDeployment getDeployment()
    {
-      return lifecycle.getDeployment();
+      return getLifecycle().getDeployment();
    }
 
    /**
@@ -134,13 +134,13 @@ public MockDeployment getDeployment()
     */
    public void ensureRequestActive()
    {
-      if (!lifecycle.isSessionActive())
+      if (!getLifecycle().isSessionActive())
       {
-         lifecycle.beginSession();
+         getLifecycle().beginSession();
       }
-      if (!lifecycle.isRequestActive())
+      if (!getLifecycle().isRequestActive())
       {
-         lifecycle.beginRequest();
+         getLifecycle().beginRequest();
       }
    }
 
@@ -150,17 +150,17 @@ public void ensureRequestActive()
     */
    public void stopContainer()
    {
-      if (lifecycle.isRequestActive())
+      if (getLifecycle().isRequestActive())
       {
-         lifecycle.endRequest();
+         getLifecycle().endRequest();
       }
-      if (lifecycle.isSessionActive())
+      if (getLifecycle().isSessionActive())
       {
-         lifecycle.endSession();
+         getLifecycle().endSession();
       }
-      if (lifecycle.isApplicationActive())
+      if (getLifecycle().isApplicationActive())
       {
-         lifecycle.endApplication();
+         getLifecycle().endApplication();
       }
    }
 

diff --git a/...ava/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java b/...ava/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java
@@ -41,7 +41,7 @@ public void test()
       List<Class<?>> classes = new ArrayList<Class<?>>();
       classes.add(WeldBean.class);
       TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
-      container.startContainer(false);
+      container.getLifecycle().initialize();
 
       BeanManager bootstrapManager = container.getBeanManager();
       assert bootstrapManager != null;
@@ -52,7 +52,7 @@ public void test()
 
 
       //Start the application
-      container.beginApplication();
+      container.getLifecycle().beginApplication();
       container.ensureRequestActive();
 
       //Check the manager is the same as before