[jboss-cvs] JBoss Messaging SVN: r1651 - in branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging: core/paging core/plugin jms

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

Author: juha at jboss.org
Date: 2006-11-28 19:22:57 -0500 (Tue, 28 Nov 2006)
New Revision: 1651

Modified:
   branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
   branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
   branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
   branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
Log:
7 failures down, 18+5 to go (JBMESSAGING-658)

Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java	2006-11-29 00:20:00 UTC (rev 1650)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java	2006-11-29 00:22:57 UTC (rev 1651)
@@ -56,6 +56,8 @@
  * A PagingStateTestBase.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ * 
  * @version 1.1
  *
  * PagingStateTestBase.java,v 1.1 2006/03/22 10:23:35 timfox Exp

Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java	2006-11-29 00:20:00 UTC (rev 1650)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java	2006-11-29 00:22:57 UTC (rev 1651)
@@ -40,6 +40,8 @@
  * A PagingTest_Reload.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ * 
  * @version 1.1
  *
  * SingleChannel_Reload.java,v 1.1 2006/03/22 10:23:35 timfox Exp

Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java	2006-11-29 00:20:00 UTC (rev 1650)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java	2006-11-29 00:22:57 UTC (rev 1651)
@@ -46,6 +46,7 @@
 import org.jboss.messaging.core.plugin.contract.PersistenceManager;
 import org.jboss.messaging.core.tx.Transaction;
 import org.jboss.messaging.core.tx.TransactionRepository;
+import org.jboss.messaging.core.tx.PreparedTxInfo;
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.core.SimpleChannel;
 import org.jboss.test.messaging.tools.ServerManagement;
@@ -56,6 +57,8 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ *
  * @version <tt>1.1</tt>
  *
  * JDBCPersistenceManagerTest.java,v 1.1 2006/02/22 17:33:44 timfox Exp
@@ -1043,11 +1046,16 @@
       List txList = pm.retrievePreparedTransactions();
       assertNotNull(txList);
       assertEquals(messages.length, txList.size());
-      
+
+      List retrievedXids = new ArrayList();
+
       for (int i = 0; i < xids.length; i++)
+         retrievedXids.add(((PreparedTxInfo)txList.get(i)).getXid());
+
+      for (int i = 0; i < xids.length; i++)
       {
          Xid xid = xids[i];
-         assertTrue(txList.contains(xid));
+         assertTrue(retrievedXids.contains(xid));
       }
       
       //rollback the txs

Modified: branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2006-11-29 00:20:00 UTC (rev 1650)
+++ branches/Branch_1_0_XARecovery/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2006-11-29 00:22:57 UTC (rev 1651)
@@ -33,7 +33,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
  */
 public class XARecoveryTest extends MessagingTestCase
 {