[jboss-cvs] JBossAS SVN: r76571 - projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy.

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

Author: wolfc
Date: 2008-08-01 08:48:06 -0400 (Fri, 01 Aug 2008)
New Revision: 76571

Modified:
   projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java
Log:
Proper tearDown of test case

Modified: projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java
===================================================================
--- projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java	2008-08-01 12:42:42 UTC (rev 76570)
+++ projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java	2008-08-01 12:48:06 UTC (rev 76571)
@@ -44,22 +44,12 @@
    private static Logger log = Logger.getLogger(RemotingProxyFactoryTestCase.class);
    private static boolean firstTime = true;
    
+   private TestBootstrap bootstrap;
 
-   public static void main(String[] args)
-   {
-      RemotingProxyFactoryTestCase test = new RemotingProxyFactoryTestCase();
-      try
-      {
-         test.testRemotingProxy();
-      }
-      catch (Throwable e)
-      {
-         log.error("Error", e);
-      }
-   }
-   
    public void setUp() throws Exception
    {
+      bootstrap = new TestBootstrap();
+      
       if (firstTime)
       {
          firstTime = false;
@@ -73,12 +63,15 @@
       }
       
       URL url = getDeployableXmlUrl(getClass());
-      new TestBootstrap().deploy(url);
+      bootstrap.deploy(url);
    }
 
-   
+   @Override
    public void tearDown()
    {
+      if(bootstrap != null)
+         bootstrap.shutdown();
+      bootstrap = null;
    }
    
    
@@ -144,7 +137,6 @@
       private static Logger log = Logger.getLogger(TestBootstrap.class);
       
       private BasicXMLDeployer deployer;
-      private Thread shutdownHook;
       
       public TestBootstrap()
       {
@@ -154,17 +146,6 @@
          
          // Create and set an XML Deployer
          deployer = new BasicXMLDeployer(getKernel());
-
-         // Add a shutdown hook
-         shutdownHook = new Thread()
-         {
-            public void run()
-            {
-               deployer.shutdown();
-            }
-         };
-         
-         Runtime.getRuntime().addShutdownHook(shutdownHook);
          log.info("Started: " + this);
       }
       
@@ -181,5 +162,11 @@
             throw new RuntimeException("Could not deploy " + url.toString(), e);
          }
       }
+      
+      protected void shutdown()
+      {
+         deployer.shutdown();
+         log.info("Shutdown complete");
+      }
    }
 }
\ No newline at end of file