[hornetq-commits] JBoss hornetq SVN: r9540 - in trunk: tests/src/org/hornetq/tests/integration/ra and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-08-13 09:45:27 -0400 (Fri, 13 Aug 2010)
New Revision: 9540

Modified:
   trunk/src/main/org/hornetq/ra/HornetQRASession.java
   trunk/tests/src/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java
Log:
Resource Adapter test

* destroy the underlying connection after a session is closed

Modified: trunk/src/main/org/hornetq/ra/HornetQRASession.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRASession.java	2010-08-13 05:54:20 UTC (rev 9539)
+++ trunk/src/main/org/hornetq/ra/HornetQRASession.java	2010-08-13 13:45:27 UTC (rev 9540)
@@ -49,6 +49,7 @@
 import javax.jms.XATopicSession;
 import javax.resource.ResourceException;
 import javax.resource.spi.ConnectionEvent;
+import javax.resource.spi.ManagedConnection;
 import javax.transaction.xa.XAResource;
 
 import org.hornetq.core.logging.Logger;
@@ -1333,6 +1334,12 @@
       mc = managedConnection;
    }
 
+   /** for tests only */
+   public ManagedConnection getManagedConnection()
+   {
+      return mc;
+   }
+   
    /**
     * Destroy
     */

Modified: trunk/tests/src/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java	2010-08-13 05:54:20 UTC (rev 9539)
+++ trunk/tests/src/org/hornetq/tests/integration/ra/OutgoingConnectionTest.java	2010-08-13 13:45:27 UTC (rev 9540)
@@ -22,10 +22,12 @@
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.XAQueueConnection;
 import javax.jms.XASession;
+import javax.resource.spi.ManagedConnection;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
@@ -37,6 +39,7 @@
 import org.hornetq.ra.HornetQRAConnectionFactoryImpl;
 import org.hornetq.ra.HornetQRAConnectionManager;
 import org.hornetq.ra.HornetQRAManagedConnectionFactory;
+import org.hornetq.ra.HornetQRASession;
 import org.hornetq.ra.HornetQResourceAdapter;
 import org.hornetq.utils.UUIDGenerator;
 
@@ -100,7 +103,10 @@
       TextMessage textMessage = (TextMessage) consumer.receive(1000);
       assertNotNull(textMessage);
       assertEquals(textMessage.getText(), "test");
+      
+      ManagedConnection mc = ((HornetQRASession)s).getManagedConnection();
       s.close();
+      mc.destroy();
    }
 
    public void testSimpleMessageSendAndReceiveXA() throws Exception
@@ -135,9 +141,10 @@
       resource.commit(xid, true);
       assertNotNull(textMessage);
       assertEquals(textMessage.getText(), "test");
+
+      ManagedConnection mc = ((HornetQRASession)s).getManagedConnection();
       s.close();
-      
-      resourceAdapter.stop();
+      mc.destroy();
    }
 
    public void testSimpleMessageSendAndReceiveTransacted() throws Exception
@@ -168,7 +175,10 @@
       assertNotNull(textMessage);
       assertEquals(textMessage.getText(), "test");
       s.commit();
+      
+      ManagedConnection mc = ((HornetQRASession)s).getManagedConnection();
       s.close();
+      mc.destroy();
    }
 
    public void testMultipleSessionsThrowsException() throws Exception
@@ -192,7 +202,10 @@
       {
          assertTrue(e.getLinkedException() instanceof IllegalStateException);
       }
+      
+      ManagedConnection mc = ((HornetQRASession)s).getManagedConnection();
       s.close();
+      mc.destroy();
    }
 
    public void testConnectionCredentials() throws Exception
@@ -206,10 +219,19 @@
       mcf.setResourceAdapter(resourceAdapter);
       HornetQRAConnectionFactory qraConnectionFactory = new HornetQRAConnectionFactoryImpl(mcf, qraConnectionManager);
       QueueConnection queueConnection = qraConnectionFactory.createQueueConnection();
-      queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE).close();
+      QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+      ManagedConnection mc = ((HornetQRASession)session).getManagedConnection();
       queueConnection.close();
+      mc.destroy();
+
       queueConnection = qraConnectionFactory.createQueueConnection("testuser", "testpassword");
-      queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE).close();
+      session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+      
+      mc = ((HornetQRASession)session).getManagedConnection();
+      queueConnection.close();
+      mc.destroy();
+
    }
 
    public void testConnectionCredentialsFail() throws Exception
@@ -223,8 +245,12 @@
       mcf.setResourceAdapter(resourceAdapter);
       HornetQRAConnectionFactory qraConnectionFactory = new HornetQRAConnectionFactoryImpl(mcf, qraConnectionManager);
       QueueConnection queueConnection = qraConnectionFactory.createQueueConnection();
-      queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE).close();
+      QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+      
+      ManagedConnection mc = ((HornetQRASession)session).getManagedConnection();
       queueConnection.close();
+      mc.destroy();
+
       queueConnection = qraConnectionFactory.createQueueConnection("testuser", "testwrongpassword");
       try
       {