[jboss-cvs] JBossAS SVN: r57143 - trunk/testsuite/src/main/org/jboss/test/jca/test

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

Author: weston.price at jboss.com
Date: 2006-09-25 13:10:02 -0400 (Mon, 25 Sep 2006)
New Revision: 57143

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java
Log:
[JBAS-3693] Added test case for this condition with changes made in XAManageConnection.

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java	2006-09-25 17:09:30 UTC (rev 57142)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java	2006-09-25 17:10:02 UTC (rev 57143)
@@ -84,6 +84,7 @@
       suite.addTest(new XATxConnectionManagerUnitTestCase("testEnlistAfterMarkRollback"));
       suite.addTest(new XATxConnectionManagerUnitTestCase("testBrokenConnectionAndTrackByTx"));
       suite.addTest(new XATxConnectionManagerUnitTestCase("testFailedStartTx"));
+      suite.addTest(new XATxConnectionManagerUnitTestCase("testFailedEndTx"));
 
       return suite;
    }
@@ -353,13 +354,14 @@
      {
      }      
      conn.close();
-     
+     tm.rollback();
      assertTrue(conn2 == null);            
      assertTrue(cm.getPoolingStrategy().getConnectionCount() == 1);
   }
   
   public void testFailedEndTx() throws Exception
   {
+     TestManagedConnection.setFailInStart(false, XAException.XAER_RMFAIL);
      TestManagedConnection.setFailInEnd(false, XAException.XAER_RMFAIL);
      tm.begin();
      TestConnection conn = null;
@@ -372,10 +374,13 @@
         
         //One should have been created
         assertTrue(cm.getPoolingStrategy().getConnectionCount() == 1);
+        conn.close();
 
         TestManagedConnection.setFailInEnd(true, XAException.XAER_RMFAIL);
         
         conn2 = (TestConnection)cm.allocateConnection(mcf, cri);
+        conn2.close();
+        tm.commit();
         
         fail("Should not be here.");
      
@@ -384,10 +389,8 @@
      {
      }      
      
-     conn.close();
-     
-     assertTrue(conn2 == null);            
-     assertTrue(cm.getPoolingStrategy().getConnectionCount() == 1);
+     assertTrue(conn2.getMCIsNull());
+     assertTrue(cm.getPoolingStrategy().getConnectionCount() == 0);
 
   }