[jboss-svn-commits] JBoss Common SVN: r4331 - arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-04-25 21:16:53 -0400 (Sun, 25 Apr 2010)
New Revision: 4331

Modified:
   arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java
   arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedTestEnricher.java
Log:
[ARQ-103] Register UnDeploy with the correct context

Modified: arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java
===================================================================
--- arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java	2010-04-25 01:10:38 UTC (rev 4330)
+++ arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java	2010-04-26 01:16:53 UTC (rev 4331)
@@ -80,12 +80,12 @@
    // Required Implementations -----------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
 
-   public void setup(Context context, Configuration configuration) 
+   public void setup(final Context context,final  Configuration configuration) 
    {
       //configuration.getContainerConfig(JBossReloadedConfiguration.class);
    }
    
-   public ContainerMethodExecutor deploy(Context context, final Archive<?> archive) throws DeploymentException
+   public ContainerMethodExecutor deploy(final Context context, final Archive<?> archive) throws DeploymentException
    {
       // Deploy
       try
@@ -144,9 +144,9 @@
       context.add(ShrinkWrapDeployer.class, deployer);
    }
 
-   public void stop(Context context) throws LifecycleException
+   public void stop(final Context context) throws LifecycleException
    {
-      MCServer server = context.get(MCServer.class);
+      final MCServer server = context.get(MCServer.class);
       // If we've got a server
       if (server != null && server.getState().equals(LifecycleState.STARTED))
       {

Modified: arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedTestEnricher.java
===================================================================
--- arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedTestEnricher.java	2010-04-25 01:10:38 UTC (rev 4330)
+++ arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedTestEnricher.java	2010-04-26 01:16:53 UTC (rev 4331)
@@ -55,7 +55,8 @@
    // Required Implementations -----------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
 
-   /* (non-Javadoc)
+   /**
+    * {@inheritDoc}
     * @see org.jboss.arquillian.spi.TestEnricher#enrich(org.jboss.arquillian.spi.Context, java.lang.Object)
     */
    public void enrich(final Context context, final Object testCase)
@@ -73,31 +74,32 @@
       try
       {
          controller.install(bmdb.getBeanMetaData(), testCase);
-         context.register(BeforeUnDeploy.class, new TestCaseUnInstaller());
+         context.getParentContext().register(BeforeUnDeploy.class, new TestCaseUnInstaller());
       }
       catch (final Throwable e)
       {
          throw new RuntimeException("Could not enrich " + testCase + " by installing the instance into MC", e);
       }
    }
-   
-   /* (non-Javadoc)
+
+   /**
+    * {@inheritDoc}
     * @see org.jboss.arquillian.spi.TestEnricher#resolve(org.jboss.arquillian.spi.Context, java.lang.reflect.Method)
     */
-   public Object[] resolve(Context context, Method method)
+   public Object[] resolve(final Context context, final Method method)
    {
       return new Object[method.getParameterTypes().length];
    }
-   
+
    /**
     * Uninstall the installed test case from the MCServer before undeploying. 
     *
     * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
     * @version $Revision: $
     */
-   private static class TestCaseUnInstaller implements EventHandler<ContainerEvent> 
+   private static class TestCaseUnInstaller implements EventHandler<ContainerEvent>
    {
-      public void callback(Context context, ContainerEvent event) throws Exception
+      public void callback(final Context context, final ContainerEvent event) throws Exception
       {
          context.get(MCServer.class).getKernel().getController().uninstall(ReloadedTestEnricher.BIND_NAME_TEST);
       }