[hornetq-commits] JBoss hornetq SVN: r12184 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11.

[do-not-reply at jboss.org]

Author: borges
Date: 2012-02-23 09:19:44 -0500 (Thu, 23 Feb 2012)
New Revision: 12184

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestBase2.java
Log:
protect tearDown from setUp failures, say ChannelException on server initialization.

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java	2012-02-23 14:19:24 UTC (rev 12183)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/ExtraStompTest.java	2012-02-23 14:19:44 UTC (rev 12184)
@@ -10,16 +10,12 @@
 public class ExtraStompTest extends StompTestBase2
 {
    
+   @Override
    protected void setUp() throws Exception
    {
       persistenceEnabled = true;
       super.setUp();
    }
-   
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-   }
 
    public void testSendAndReceive10() throws Exception
    {

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestBase2.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestBase2.java	2012-02-23 14:19:24 UTC (rev 12183)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestBase2.java	2012-02-23 14:19:44 UTC (rev 12184)
@@ -55,7 +55,7 @@
    private static final transient Logger log = Logger.getLogger(StompTestBase2.class);
 
    protected String hostname = "127.0.0.1";
-   
+
    protected int port = 61613;
 
    private ConnectionFactory connectionFactory;
@@ -69,15 +69,16 @@
    protected Topic topic;
 
    protected JMSServerManager server;
-   
+
    protected String defUser = "brianm";
-   
+
    protected String defPass = "wombats";
-   
+
    protected boolean persistenceEnabled = false;
 
    // Implementation methods
    // -------------------------------------------------------------------------
+   @Override
    protected void setUp() throws Exception
    {
       super.setUp();
@@ -95,14 +96,14 @@
 
    /**
    * @return
-   * @throws Exception 
+   * @throws Exception
    */
    protected JMSServerManager createServer() throws Exception
    {
       Configuration config = createBasicConfig();
       config.setSecurityEnabled(false);
       config.setPersistenceEnabled(persistenceEnabled);
-      
+
       System.out.println("-----------------server persist: " + persistenceEnabled);
 
       Map<String, Object> params = new HashMap<String, Object>();
@@ -111,7 +112,7 @@
       TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params);
       config.getAcceptorConfigurations().add(stompTransport);
       config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
-      HornetQServer hornetQServer = HornetQServers.newHornetQServer(config, defUser, defPass);
+      HornetQServer hornetQServer = addServer(HornetQServers.newHornetQServer(config, defUser, defPass));
 
       JMSConfiguration jmsConfig = new JMSConfigurationImpl();
       jmsConfig.getQueueConfigurations()
@@ -122,13 +123,20 @@
       return server;
    }
 
+   @Override
    protected void tearDown() throws Exception
    {
-      connection.close();
-
-      server.stop();
-
-      super.tearDown();
+      try
+      {
+         if (connection != null)
+            connection.close();
+         if (server != null)
+            server.stop();
+      }
+      finally
+      {
+         super.tearDown();
+      }
    }
 
    protected ConnectionFactory createConnectionFactory()