From do-not-reply at jboss.org Mon Jan  9 04:04:21 2012
Content-Type: multipart/mixed; boundary="===============3014794064290856319=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r11997 -
 trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server.
Date: Mon, 09 Jan 2012 04:04:20 -0500
Message-ID: <201201090904.q0994Kl9016631@svn01.web.mwc.hst.phx2.redhat.com>

--===============3014794064290856319==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: borges
Date: 2012-01-09 04:04:19 -0500 (Mon, 09 Jan 2012)
New Revision: 11997

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integratio=
n/jms/server/JMSServerStartStopTest.java
Log:
Fix failing test by doing clean-up of previous one.

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/int=
egration/jms/server/JMSServerStartStopTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati=
on/jms/server/JMSServerStartStopTest.java	2012-01-06 20:58:23 UTC (rev 1199=
6)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integrati=
on/jms/server/JMSServerStartStopTest.java	2012-01-09 09:04:19 UTC (rev 1199=
7)
@@ -27,7 +27,6 @@
 import org.hornetq.api.jms.JMSFactoryType;
 import org.hornetq.core.config.impl.FileConfiguration;
 import org.hornetq.core.logging.Logger;
-import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
 import org.hornetq.core.server.HornetQServer;
 import org.hornetq.core.server.impl.HornetQServerImpl;
 import org.hornetq.jms.client.HornetQConnectionFactory;
@@ -35,16 +34,13 @@
 import org.hornetq.jms.server.impl.JMSServerManagerImpl;
 import org.hornetq.spi.core.security.HornetQSecurityManager;
 import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
-import org.hornetq.tests.util.ServiceTestBase;
 import org.hornetq.tests.util.UnitTestCase;
 =

 /**
- * =

+ *
  * A JMSServerStartStopTest
  *
  * @author <a href=3D"mailto:tim.fox(a)jboss.com">Tim Fox</a>
- *
- *
  */
 public class JMSServerStartStopTest extends UnitTestCase
 {
@@ -56,6 +52,10 @@
 =

    private JMSServerManager liveJMSServer;
 =

+   private Connection conn;
+
+   private HornetQConnectionFactory jbcf;
+
    // Static --------------------------------------------------------
 =

    // Constructors --------------------------------------------------
@@ -72,13 +72,14 @@
 =

          start();
 =

-         HornetQConnectionFactory jbcf =3D (HornetQConnectionFactory) Horn=
etQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new Transp=
ortConfiguration(NettyConnectorFactory.class.getCanonicalName()));
+         HornetQConnectionFactory jbcf =3D createConnectionFactory();
 =

          jbcf.setBlockOnDurableSend(true);
          jbcf.setBlockOnNonDurableSend(true);
 =

          Connection conn =3D jbcf.createConnection();
-
+         try
+         {
          Session sess =3D conn.createSession(false, Session.AUTO_ACKNOWLED=
GE);
 =

          Queue queue =3D sess.createQueue("myJMSQueue");
@@ -88,23 +89,25 @@
          TextMessage tm =3D sess.createTextMessage("message" + j);
 =

          producer.send(tm);
-
+         }
+         finally
+         {
          conn.close();
 =

          jbcf.close();
 =

          stop();
-
+         }
       }
 =

       start();
 =

-      HornetQConnectionFactory jbcf =3D (HornetQConnectionFactory) HornetQ=
JMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new Transport=
Configuration(NettyConnectorFactory.class.getCanonicalName()));
+      jbcf =3D createConnectionFactory();
 =

       jbcf.setBlockOnDurableSend(true);
       jbcf.setBlockOnNonDurableSend(true);
 =

-      Connection conn =3D jbcf.createConnection();
+      conn =3D jbcf.createConnection();
 =

       Session sess =3D conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 =

@@ -118,7 +121,7 @@
       {
          TextMessage tm =3D (TextMessage)consumer.receive(10000);
 =

-         Assert.assertNotNull(tm);
+         Assert.assertNotNull("not null", tm);
 =

          Assert.assertEquals("message" + i, tm.getText());
       }
@@ -129,39 +132,42 @@
 =

       stop();
    }
-   =

+
    // https://jira.jboss.org/jira/browse/HORNETQ-315
    public void testCloseConnectionAfterServerIsShutdown() throws Exception
    {
       start();
-      =

-      HornetQConnectionFactory jbcf =3D (HornetQConnectionFactory) HornetQ=
JMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new Transport=
Configuration(NettyConnectorFactory.class.getCanonicalName()));
 =

+      jbcf =3D createConnectionFactory();
+
       jbcf.setBlockOnDurableSend(true);
       jbcf.setBlockOnNonDurableSend(true);
       jbcf.setReconnectAttempts(-1);
-      =

-      Connection conn =3D jbcf.createConnection();
-      =

+
+      conn =3D jbcf.createConnection();
+
       stop();
-      =

       conn.close();
    }
 =

-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   @Override
-   protected void setUp() throws Exception
+   /**
+    * @return
+    */
+   private HornetQConnectionFactory createConnectionFactory()
    {
-      super.setUp();
+      return HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryT=
ype.CF,
+                                                        new TransportConfi=
guration(NETTY_CONNECTOR_FACTORY));
    }
 =

    @Override
    protected void tearDown() throws Exception
    {
-      liveJMSServer.stop();
+      if (conn !=3D null)
+         conn.close();
+      if (jbcf !=3D null)
+         jbcf.close();
+      if (liveJMSServer !=3D null)
+         liveJMSServer.stop();
       liveJMSServer =3D null;
       super.tearDown();
    }
@@ -180,7 +186,7 @@
       fc.setConfigurationUrl("server-start-stop-config1.xml");
 =

       fc.start();
-      =

+
       fc.setJournalDirectory(getJournalDir());
       fc.setBindingsDirectory(getBindingsDir());
       fc.setLargeMessagesDirectory(getLargeMessagesDir());


--===============3014794064290856319==--