[jboss-cvs] JBoss Messaging SVN: r3439 - branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/clustering.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 6 19:24:35 EST 2007
Author: timfox
Date: 2007-12-06 19:24:35 -0500 (Thu, 06 Dec 2007)
New Revision: 3439
Modified:
branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
Log:
oops tweak to test
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-12-06 23:08:30 UTC (rev 3438)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-12-07 00:24:35 UTC (rev 3439)
@@ -1611,118 +1611,8 @@
}
}
- public void testFailoverDeliveryRecoveryTransacted() throws Exception
- {
- Connection conn0 = null;
- Connection conn1 = null;
-
- try
- {
- conn0 = this.createConnectionOnServer(cf, 0);
-
- assertEquals(0, ((JBossConnection)conn0).getServerID());
-
- // Objects Server1
- conn1 = this.createConnectionOnServer(cf, 1);
-
- assertEquals(1, ((JBossConnection)conn1).getServerID());
-
- Session session1 = conn1.createSession(true, Session.SESSION_TRANSACTED);
-
- Session session2 = conn1.createSession(true, Session.SESSION_TRANSACTED);
-
- MessageConsumer cons1 = session1.createConsumer(queue[1]);
-
- MessageConsumer cons2 = session2.createConsumer(queue[1]);
-
- MessageProducer prod = session1.createProducer(queue[1]);
-
- conn1.start();
-
- TextMessage tm1 = session1.createTextMessage("message1");
-
- TextMessage tm2 = session1.createTextMessage("message2");
-
- TextMessage tm3 = session1.createTextMessage("message3");
-
- prod.send(tm1);
-
- prod.send(tm2);
-
- prod.send(tm3);
-
- session1.commit();
-
- TextMessage rm1 = (TextMessage)cons1.receive(3000);
-
- assertNotNull(rm1);
-
- assertEquals(tm1.getText(), rm1.getText());
-
- TextMessage rm2 = (TextMessage)cons2.receive(3000);
-
- assertNotNull(rm2);
-
- assertEquals(tm2.getText(), rm2.getText());
-
- SimpleFailoverListener failoverListener = new SimpleFailoverListener();
- ((JBossConnection)conn1).registerFailoverListener(failoverListener);
-
- ServerManagement.kill(1);
-
- // wait for the client-side failover to complete
-
- while(true)
- {
- FailoverEvent event = failoverListener.getEvent(30000);
- if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
- {
- break;
- }
- if (event == null)
- {
- fail("Did not get expected FAILOVER_COMPLETED event");
- }
- }
-
- // failover complete
-
- //now commit
-
- session1.commit();
-
- session2.commit();
-
- session1.close();
-
- session2.close();;
-
- Session session3 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageConsumer cons3 = session3.createConsumer(queue[0]);
-
- TextMessage rm3 = (TextMessage)cons3.receive(2000);
-
- assertNotNull(rm3);
-
- assertEquals(tm3.getText(), rm3.getText());
-
- checkEmpty(queue[1], 0);
- }
- finally
- {
- if (conn1 != null)
- {
- conn1.close();
- }
-
- if (conn0 != null)
- {
- conn0.close();
- }
- }
- }
+
public void testDurableSubscriptionFailover() throws Exception
{
Connection conn = null;
@@ -1787,6 +1677,10 @@
assertEquals("message" + i, tm.getText());
}
+
+ cons.close();
+
+ session.unsubscribe("mysub1");
}
finally
{
@@ -1873,6 +1767,12 @@
assertEquals("message" + i, tm.getText());
}
+
+ cons.close();
+
+ cons0.close();
+
+ session.unsubscribe("mysub1");
}
finally
{
@@ -1962,6 +1862,10 @@
assertEquals("message" + i, tm.getText());
}
+
+ cons.close();
+
+ session.unsubscribe("mysub1");
}
finally
{
@@ -1973,7 +1877,119 @@
ServerManagement.getServer(0).undeployConnectionFactory(new ObjectName("jboss.messaging.connectionfactory:service=WibbleConnectionFactory"));
}
}
+
+ public void testFailoverDeliveryRecoveryTransacted() throws Exception
+ {
+ Connection conn0 = null;
+ Connection conn1 = null;
+ try
+ {
+ conn0 = this.createConnectionOnServer(cf, 0);
+
+ assertEquals(0, ((JBossConnection)conn0).getServerID());
+
+ // Objects Server1
+ conn1 = this.createConnectionOnServer(cf, 1);
+
+ assertEquals(1, ((JBossConnection)conn1).getServerID());
+
+ Session session1 = conn1.createSession(true, Session.SESSION_TRANSACTED);
+
+ Session session2 = conn1.createSession(true, Session.SESSION_TRANSACTED);
+
+ MessageConsumer cons1 = session1.createConsumer(queue[1]);
+
+ MessageConsumer cons2 = session2.createConsumer(queue[1]);
+
+ MessageProducer prod = session1.createProducer(queue[1]);
+
+ conn1.start();
+
+ TextMessage tm1 = session1.createTextMessage("message1");
+
+ TextMessage tm2 = session1.createTextMessage("message2");
+
+ TextMessage tm3 = session1.createTextMessage("message3");
+
+ prod.send(tm1);
+
+ prod.send(tm2);
+
+ prod.send(tm3);
+
+ session1.commit();
+
+ TextMessage rm1 = (TextMessage)cons1.receive(3000);
+
+ assertNotNull(rm1);
+
+ assertEquals(tm1.getText(), rm1.getText());
+
+ TextMessage rm2 = (TextMessage)cons2.receive(3000);
+
+ assertNotNull(rm2);
+
+ assertEquals(tm2.getText(), rm2.getText());
+
+ SimpleFailoverListener failoverListener = new SimpleFailoverListener();
+ ((JBossConnection)conn1).registerFailoverListener(failoverListener);
+
+ ServerManagement.kill(1);
+
+ // wait for the client-side failover to complete
+
+ while(true)
+ {
+ FailoverEvent event = failoverListener.getEvent(30000);
+ if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
+ {
+ break;
+ }
+ if (event == null)
+ {
+ fail("Did not get expected FAILOVER_COMPLETED event");
+ }
+ }
+
+ // failover complete
+
+ //now commit
+
+ session1.commit();
+
+ session2.commit();
+
+ session1.close();
+
+ session2.close();;
+
+ Session session3 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer cons3 = session3.createConsumer(queue[0]);
+
+ TextMessage rm3 = (TextMessage)cons3.receive(2000);
+
+ assertNotNull(rm3);
+
+ assertEquals(tm3.getText(), rm3.getText());
+
+ checkEmpty(queue[1], 0);
+ }
+ finally
+ {
+ if (conn1 != null)
+ {
+ conn1.close();
+ }
+
+ if (conn0 != null)
+ {
+ conn0.close();
+ }
+ }
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
More information about the jboss-cvs-commits
mailing list