[jboss-cvs] JBoss Messaging SVN: r3452 - in branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms: message and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 10 05:26:43 EST 2007
Author: ataylor
Date: 2007-12-10 05:26:43 -0500 (Mon, 10 Dec 2007)
New Revision: 3452
Modified:
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/PersistenceTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSReplyToHeaderTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
Log:
put back receive()
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -53,7 +53,7 @@
}
// Public --------------------------------------------------------
-
+
public void testNoop() throws Exception
{
log.info("noop");
@@ -62,32 +62,32 @@
public void test_NonPersistent_NonTransactional() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
+
TextMessage m = session.createTextMessage("message one");
-
+
prod.send(m);
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
-
+
+ TextMessage rm = (TextMessage)cons.receive();
+
assertEquals("message one", rm.getText());
}
finally
@@ -100,36 +100,36 @@
}
public void test_CreateTextMessageNull() throws Exception
- {
+ {
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
+
TextMessage m = session.createTextMessage();
-
+
m.setText("message one");
-
+
prod.send(m);
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
-
+
+ TextMessage rm = (TextMessage)cons.receive();
+
assertEquals("message one", rm.getText());
}
finally
@@ -144,33 +144,33 @@
public void test_Persistent_NonTransactional() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.PERSISTENT);
-
+
TextMessage m = session.createTextMessage("message one");
-
+
prod.send(m);
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
-
- assertEquals("message one", rm.getText());
+
+ TextMessage rm = (TextMessage)cons.receive();
+
+ assertEquals("message one", rm.getText());
}
finally
{
@@ -184,36 +184,36 @@
public void test_NonPersistent_Transactional_Send() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
+
TextMessage m = session.createTextMessage("message one");
prod.send(m);
m = session.createTextMessage("message two");
prod.send(m);
-
+
session.commit();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
+
+ TextMessage rm = (TextMessage)cons.receive();
assertEquals("message one", rm.getText());
- rm = (TextMessage)cons.receive(2000);
+ rm = (TextMessage)cons.receive();
assertEquals("message two", rm.getText());
}
finally
@@ -226,38 +226,38 @@
}
public void test_Persistent_Transactional_Send() throws Exception
- {
+ {
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.PERSISTENT);
-
+
TextMessage m = session.createTextMessage("message one");
prod.send(m);
m = session.createTextMessage("message two");
prod.send(m);
-
+
session.commit();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
+
+ TextMessage rm = (TextMessage)cons.receive();
assertEquals("message one", rm.getText());
- rm = (TextMessage)cons.receive(2000);
+ rm = (TextMessage)cons.receive();
assertEquals("message two", rm.getText());
}
finally
@@ -271,33 +271,33 @@
public void test_NonPersistent_Transactional_Acknowledgment() throws Exception
- {
+ {
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
TextMessage m = session.createTextMessage("one");
prod.send(m);
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
- TextMessage rm = (TextMessage)cons.receive(2000);
+
+ TextMessage rm = (TextMessage)cons.receive();
assertEquals("one", rm.getText());
-
+
session.commit();
}
finally
@@ -312,19 +312,19 @@
public void test_Asynchronous_to_Client() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
final MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
+
final Slot slot = new Slot();
-
+
new Thread(new Runnable()
{
public void run()
@@ -341,19 +341,19 @@
{
log.error("receive failed", e);
}
-
+
}
}, "Receiving Thread").start();
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
+
TextMessage m = session.createTextMessage("message one");
-
+
prod.send(m);
-
+
TextMessage rm = (TextMessage)slot.poll(5000);
-
+
assertEquals("message one", rm.getText());
}
finally
@@ -366,19 +366,19 @@
}
public void test_MessageListener() throws Exception
- {
+ {
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
final Slot slot = new Slot();
-
+
cons.setMessageListener(new MessageListener()
{
public void onMessage(Message m)
@@ -393,16 +393,16 @@
}
}
});
-
+
conn.start();
-
+
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
TextMessage m = session.createTextMessage("one");
prod.send(m);
-
+
TextMessage rm = (TextMessage)slot.poll(5000);
-
+
assertEquals("one", rm.getText());
}
finally
@@ -417,28 +417,28 @@
public void test_ClientAcknowledge() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageProducer p = session.createProducer(queue1);
p.send(session.createTextMessage("CLACK"));
-
+
MessageConsumer cons = session.createConsumer(queue1);
-
+
conn.start();
-
+
TextMessage m = (TextMessage)cons.receive(1000);
-
+
assertEquals("CLACK", m.getText());
-
+
// make sure the message is still in "delivering" state
assertRemainingMessages(1);
-
+
m.acknowledge();
-
+
assertRemainingMessages(0);
}
finally
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/PersistenceTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/PersistenceTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/PersistenceTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -24,7 +24,7 @@
import javax.jms.*;
/**
- *
+ *
* A PersistenceTest
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -38,7 +38,7 @@
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
@@ -60,41 +60,41 @@
/**
* Test that the messages in a persistent queue survive starting and stopping and server,
- *
+ *
*/
public void testQueuePersistence() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sess.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.PERSISTENT);
-
+
for (int i = 0; i < 10; i++)
{
TextMessage tm = sess.createTextMessage("message" + i);
prod.send(tm);
}
-
+
conn.close();
-
+
stop();
-
+
start();
-
+
// Messaging server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
MessageConsumer cons = sess.createConsumer(queue1);
for (int i = 0; i < 10; i++)
{
- TextMessage tm = (TextMessage)cons.receive(10000);
+ TextMessage tm = (TextMessage)cons.receive(3000);
assertNotNull(tm);
if (tm == null)
{
@@ -111,86 +111,86 @@
}
}
}
-
+
/**
* Test that the JMSRedelivered and delivery count survives a restart
- *
+ *
*/
public void testJMSRedeliveredRestart() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sess.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.PERSISTENT);
-
+
for (int i = 0; i < 10; i++)
{
TextMessage tm = sess.createTextMessage("message" + i);
prod.send(tm);
}
-
+
Session sess2 = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
MessageConsumer cons = sess2.createConsumer(queue1);
-
+
conn.start();
-
+
for (int i = 0; i < 10; i++)
{
TextMessage tm = (TextMessage)cons.receive(1000);
-
+
assertNotNull(tm);
-
+
assertEquals("message" + i, tm.getText());
-
+
assertFalse(tm.getJMSRedelivered());
-
+
assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
}
-
+
//rollback
sess2.rollback();
-
+
for (int i = 0; i < 10; i++)
{
TextMessage tm = (TextMessage)cons.receive(1000);
-
+
assertNotNull(tm);
-
+
assertEquals("message" + i, tm.getText());
-
+
assertTrue(tm.getJMSRedelivered());
-
+
assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
}
-
+
conn.close();
stop();
start();
-
+
// Messaging server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
cons = sess.createConsumer(queue1);
for (int i = 0; i < 10; i++)
{
- TextMessage tm = (TextMessage)cons.receive(10000);
-
+ TextMessage tm = (TextMessage)cons.receive(3000);
+
assertNotNull(tm);
-
+
assertEquals("message" + i, tm.getText());
-
+
assertTrue(tm.getJMSRedelivered());
-
+
assertEquals(3, tm.getIntProperty("JMSXDeliveryCount"));
}
}
@@ -202,21 +202,21 @@
}
}
}
-
-
+
+
/**
- * First test that message order survives a restart
+ * First test that message order survives a restart
*/
public void testMessageOrderPersistence_1() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sessSend.createProducer(queue1);
-
+
TextMessage m0 = sessSend.createTextMessage("a");
TextMessage m1 = sessSend.createTextMessage("b");
TextMessage m2 = sessSend.createTextMessage("c");
@@ -226,8 +226,8 @@
TextMessage m6 = sessSend.createTextMessage("g");
TextMessage m7 = sessSend.createTextMessage("h");
TextMessage m8 = sessSend.createTextMessage("i");
- TextMessage m9 = sessSend.createTextMessage("j");
-
+ TextMessage m9 = sessSend.createTextMessage("j");
+
prod.send(m0, DeliveryMode.PERSISTENT, 0, 0);
prod.send(m1, DeliveryMode.PERSISTENT, 1, 0);
prod.send(m2, DeliveryMode.PERSISTENT, 2, 0);
@@ -238,21 +238,21 @@
prod.send(m7, DeliveryMode.PERSISTENT, 7, 0);
prod.send(m8, DeliveryMode.PERSISTENT, 8, 0);
prod.send(m9, DeliveryMode.PERSISTENT, 9, 0);
-
+
conn.close();
stop();
start();
-
+
// Messaging server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
Session sessReceive = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
MessageConsumer cons = sessReceive.createConsumer(queue1);
-
+
{
TextMessage t = (TextMessage)cons.receive(1000);
assertNotNull(t);
@@ -317,20 +317,20 @@
}
}
-
+
/**
- * Second test that message order survives a restart
+ * Second test that message order survives a restart
*/
public void testMessageOrderPersistence_2() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sessSend.createProducer(queue1);
-
+
TextMessage m0 = sessSend.createTextMessage("a");
TextMessage m1 = sessSend.createTextMessage("b");
TextMessage m2 = sessSend.createTextMessage("c");
@@ -341,8 +341,8 @@
TextMessage m7 = sessSend.createTextMessage("h");
TextMessage m8 = sessSend.createTextMessage("i");
TextMessage m9 = sessSend.createTextMessage("j");
-
-
+
+
prod.send(m0, DeliveryMode.PERSISTENT, 0, 0);
prod.send(m1, DeliveryMode.PERSISTENT, 0, 0);
prod.send(m2, DeliveryMode.PERSISTENT, 0, 0);
@@ -353,20 +353,20 @@
prod.send(m7, DeliveryMode.PERSISTENT, 5, 0);
prod.send(m8, DeliveryMode.PERSISTENT, 5, 0);
prod.send(m9, DeliveryMode.PERSISTENT, 6, 0);
-
+
conn.close();
-
+
stop();
start();
-
+
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
Session sessReceive = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
MessageConsumer cons = sessReceive.createConsumer(queue1);
-
+
{
TextMessage t = (TextMessage)cons.receive(1000);
assertNotNull(t);
@@ -437,45 +437,45 @@
public void testDurableSubscriptionPersistence_1() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
conn.setClientID("five");
-
+
Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer ds = s.createDurableSubscriber(topic1, "sub", null, false);
-
+
MessageProducer p = s.createProducer(topic1);
p.setDeliveryMode(DeliveryMode.PERSISTENT);
TextMessage tm = s.createTextMessage("thebody");
-
+
p.send(tm);
log.debug("message sent");
-
+
conn.close();
-
+
stop();
start();
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
conn.setClientID("five");
-
+
s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
-
+
ds = s.createDurableSubscriber(topic1, "sub", null, false);
-
- TextMessage rm = (TextMessage)ds.receive(10000);
+
+ TextMessage rm = (TextMessage)ds.receive(3000);
assertNotNull(rm);
assertEquals("thebody", rm.getText());
-
+
ds.close();
-
+
s.unsubscribe("sub");
}
finally
@@ -493,67 +493,67 @@
public void testDurableSubscriptionPersistence_2() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
conn.setClientID("Sausages");
-
+
Session sessConsume = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer sub1 = sessConsume.createDurableSubscriber(topic1, "sub1", null, false);
MessageConsumer sub2 = sessConsume.createDurableSubscriber(topic1, "sub2", null, false);
MessageConsumer sub3 = sessConsume.createDurableSubscriber(topic1, "sub3", null, false);
-
-
+
+
Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sessSend.createProducer(topic1);
prod.setDeliveryMode(DeliveryMode.PERSISTENT);
-
+
for (int i = 0; i < 10; i++)
{
TextMessage tm = sessSend.createTextMessage("message" + i);
prod.send(tm);
}
-
+
conn.close();
-
+
stop();
start();
// Messaging server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
-
+
conn = cf.createConnection();
conn.setClientID("Sausages");
-
+
sessConsume = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn.start();
-
+
sub1 = sessConsume.createDurableSubscriber(topic1, "sub1", null, false);
sub2 = sessConsume.createDurableSubscriber(topic1, "sub2", null, false);
sub3 = sessConsume.createDurableSubscriber(topic1, "sub3", null, false);
-
+
for (int i = 0; i < 10; i++)
{
- TextMessage tm1 = (TextMessage)sub1.receive(10000);
+ TextMessage tm1 = (TextMessage)sub1.receive(3000);
assertNotNull(tm1);
if (tm1 == null)
{
break;
}
assertEquals("message" + i, tm1.getText());
-
- TextMessage tm2 = (TextMessage)sub2.receive(10000);
+
+ TextMessage tm2 = (TextMessage)sub2.receive(3000);
assertNotNull(tm2);
if (tm2 == null)
{
break;
}
assertEquals("message" + i, tm2.getText());
-
- TextMessage tm3 = (TextMessage)sub3.receive(10000);
+
+ TextMessage tm3 = (TextMessage)sub3.receive(3000);
assertNotNull(tm3);
if (tm3 == null)
{
@@ -561,11 +561,11 @@
}
assertEquals("message" + i, tm3.getText());
}
-
+
sub1.close();
sub2.close();
sub3.close();
-
+
sessConsume.unsubscribe("sub1");
sessConsume.unsubscribe("sub2");
sessConsume.unsubscribe("sub3");
@@ -578,14 +578,14 @@
}
}
}
-
+
// Package protected ---------------------------------------------
-
+
// Protected -----------------------------------------------------
-
+
// Private -------------------------------------------------------
-
+
// Inner classes -------------------------------------------------
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -38,53 +38,53 @@
public class TransactedSessionTest extends JMSTestCase
{
// Constants -----------------------------------------------------
-
+
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
-
+
// Constructors --------------------------------------------------
-
+
public TransactedSessionTest(String name)
{
super(name);
}
-
+
// Public --------------------------------------------------------
public void testResourceManagerMemoryLeakOnCommit() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
JBossConnection jbConn = (JBossConnection)conn;
-
+
ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
-
+
ConnectionState state = (ConnectionState)del.getState();
-
+
ResourceManager rm = state.getResourceManager();
-
+
Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
for (int i = 0; i < 100; i++)
{
assertEquals(1, rm.size());
-
+
session.commit();
-
+
assertEquals(1, rm.size());
- }
-
+ }
+
assertEquals(1, rm.size());
-
+
conn.close();
-
+
conn = null;
-
+
assertEquals(0, rm.size());
}
finally
@@ -95,40 +95,40 @@
}
}
}
-
+
public void testResourceManagerMemoryLeakOnRollback() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
JBossConnection jbConn = (JBossConnection)conn;
-
+
ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
-
+
ConnectionState state = (ConnectionState)del.getState();
-
+
ResourceManager rm = state.getResourceManager();
-
+
Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
+
for (int i = 0; i < 100; i++)
{
assertEquals(1, rm.size());
-
+
session.commit();
-
+
assertEquals(1, rm.size());
- }
-
+ }
+
assertEquals(1, rm.size());
-
+
conn.close();
-
+
conn = null;
-
+
assertEquals(0, rm.size());
}
finally
@@ -139,39 +139,39 @@
}
}
}
-
+
public void testSimpleRollback() throws Exception
{
// send a message
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
s.createProducer(queue1).send(s.createTextMessage("one"));
-
+
s.close();
-
+
s = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageConsumer c = s.createConsumer(queue1);
conn.start();
- Message m = c.receive(2000);
-
+ Message m = c.receive();
+
assertEquals("one", ((TextMessage)m).getText());
assertFalse(m.getJMSRedelivered());
assertEquals(1, m.getIntProperty("JMSXDeliveryCount"));
-
+
s.rollback();
-
+
// get the message again
- m = c.receive(2000);
+ m = c.receive();
assertTrue(m.getJMSRedelivered());
assertEquals(2, m.getIntProperty("JMSXDeliveryCount"));
-
+
conn.close();
-
+
ObjectName on = new ObjectName("jboss.messaging.destination:service=Queue,name=Queue1");
Integer i = getMessageCountForQueue("Queue1");
@@ -190,69 +190,69 @@
public void testRedeliveredFlagTopic() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
Session sessSend = conn.createSession(true, Session.SESSION_TRANSACTED);
- Session sess1 = conn.createSession(true, Session.SESSION_TRANSACTED);
+ Session sess1 = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageConsumer consumer1 = sess1.createConsumer(topic1);
-
+
MessageProducer producer = sessSend.createProducer(topic1);
Message mSent = sessSend.createTextMessage("igloo");
- producer.send(mSent);
+ producer.send(mSent);
sessSend.commit();
-
+
conn.start();
-
+
TextMessage mRec1 = (TextMessage)consumer1.receive(2000);
assertEquals("igloo", mRec1.getText());
assertFalse(mRec1.getJMSRedelivered());
-
+
sess1.rollback(); //causes redelivery for session
mRec1 = (TextMessage)consumer1.receive(2000);
assertEquals("igloo", mRec1.getText());
assertTrue(mRec1.getJMSRedelivered());
-
+
sess1.commit();
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
- }
+ }
}
-
-
+
+
/** Test redelivery works ok for Topic */
public void testRedeliveredTopic() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = sess.createProducer(topic1);
-
+
MessageConsumer consumer = sess.createConsumer(topic1);
conn.start();
-
+
Message mSent = sess.createTextMessage("igloo");
producer.send(mSent);
-
+
sess.commit();
-
+
TextMessage mRec = (TextMessage)consumer.receive(2000);
assertEquals("igloo", mRec.getText());
assertFalse(mRec.getJMSRedelivered());
-
+
sess.rollback();
mRec = (TextMessage)consumer.receive(2000);
@@ -260,67 +260,67 @@
assertNotNull(mRec);
assertEquals("igloo", mRec.getText());
assertTrue(mRec.getJMSRedelivered());
-
+
sess.commit();
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
}
}
-
+
public void testReceivedRollbackTopic() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = sess.createProducer(topic1);
-
+
MessageConsumer consumer = sess.createConsumer(topic1);
conn.start();
-
+
TextMessage mSent = sess.createTextMessage("igloo");
producer.send(mSent);
-
+
sess.commit();
-
+
TextMessage mRec = (TextMessage)consumer.receive(2000);
assertEquals("igloo", mRec.getText());
-
+
sess.commit();
-
+
mSent.setText("rollback");
producer.send(mSent);
-
+
sess.commit();
-
+
mRec = (TextMessage)consumer.receive(2000);
sess.rollback();
-
+
TextMessage mRec2 = (TextMessage)consumer.receive(2000);
-
+
sess.commit();
-
+
assertNotNull(mRec2);
-
+
assertEquals(mRec.getText(), mRec2.getText());
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
}
}
-
+
/**
* Send some messages in transacted session. Don't commit.
* Verify message are not received by consumer.
@@ -328,39 +328,39 @@
public void testSendNoCommitTopic() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = producerSess.createProducer(topic1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(topic1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
Message m = consumer.receive(500);
assertNull(m);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
- }
+ }
}
-
+
/**
* Send some messages in transacted session. Commit.
* Verify message are received by consumer.
@@ -368,29 +368,29 @@
public void testSendCommitTopic() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = producerSess.createProducer(topic1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(topic1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
producerSess.commit();
-
+
int count = 0;
while (true)
{
@@ -398,18 +398,18 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
}
}
-
+
/**
* Send some messages.
* Receive them in a transacted session.
@@ -420,20 +420,20 @@
public void testAckCommitTopic() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(topic1);
-
+
Session consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageConsumer consumer = consumerSess.createConsumer(topic1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
@@ -449,26 +449,26 @@
}
assertEquals(NUM_MESSAGES, count);
-
+
consumerSess.commit();
-
+
conn.stop();
consumer.close();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
Message m = consumer.receive(500);
-
+
assertNull(m);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -487,35 +487,35 @@
public void testSendRollbackTopic() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = producerSess.createProducer(topic1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(topic1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
producerSess.rollback();
-
+
Message m = consumer.receive(500);
-
+
assertNull(m);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -529,35 +529,35 @@
public void testRedeliveredQueue() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = sess.createProducer(queue1);
-
+
MessageConsumer consumer = sess.createConsumer(queue1);
- conn.start();
-
+ conn.start();
+
Message mSent = sess.createTextMessage("igloo");
producer.send(mSent);
-
+
sess.commit();
-
+
TextMessage mRec = (TextMessage)consumer.receive(2000);
assertEquals("igloo", mRec.getText());
assertFalse(mRec.getJMSRedelivered());
-
+
sess.rollback();
mRec = (TextMessage)consumer.receive(2000);
assertEquals("igloo", mRec.getText());
assertTrue(mRec.getJMSRedelivered());
-
+
sess.commit();
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -593,10 +593,10 @@
conn.start();
- TextMessage tm = (TextMessage)cons.receive(2000);
+ TextMessage tm = (TextMessage)cons.receive();
assertEquals("a message", tm.getText());
-
+
assertFalse(tm.getJMSRedelivered());
assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
@@ -607,10 +607,10 @@
cons = sess2.createConsumer(queue1);
- tm = (TextMessage)cons.receive(2000);
+ tm = (TextMessage)cons.receive();
assertEquals("a message", tm.getText());
-
+
assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
assertTrue(tm.getJMSRedelivered());
@@ -630,48 +630,48 @@
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer producer = sess.createProducer(queue1);
-
+
MessageConsumer consumer = sess.createConsumer(queue1);
conn.start();
-
+
TextMessage mSent = sess.createTextMessage("igloo");
producer.send(mSent);
log.trace("sent1");
-
+
sess.commit();
-
- TextMessage mRec = (TextMessage)consumer.receive(2000);
+
+ TextMessage mRec = (TextMessage)consumer.receive();
log.trace("Got 1");
assertNotNull(mRec);
assertEquals("igloo", mRec.getText());
-
+
sess.commit();
-
+
mSent.setText("rollback");
producer.send(mSent);
-
+
sess.commit();
-
+
log.trace("Receiving 2");
- mRec = (TextMessage)consumer.receive(2000);
+ mRec = (TextMessage)consumer.receive();
log.trace("Received 2");
assertNotNull(mRec);
assertEquals("rollback", mRec.getText());
-
+
sess.rollback();
-
- TextMessage mRec2 = (TextMessage)consumer.receive(2000);
+
+ TextMessage mRec2 = (TextMessage)consumer.receive();
assertNotNull(mRec2);
assertEquals("rollback", mRec2.getText());
-
+
sess.commit();
-
+
assertEquals(mRec.getText(), mRec2.getText());
-
+
conn.close();
}
-
+
/**
* Send some messages in transacted session. Don't commit.
* Verify message are not received by consumer.
@@ -679,33 +679,33 @@
public void testSendNoCommitQueue() throws Exception
{
Connection conn = null;
-
+
try
{
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
log.trace("Sent messages");
-
+
checkEmpty(queue1);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -713,10 +713,10 @@
}
}
-
-
-
+
+
+
/**
* Send some messages in transacted session. Commit.
* Verify message are received by consumer.
@@ -724,29 +724,29 @@
public void testSendCommitQueue() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
producerSess.commit();
-
+
int count = 0;
while (true)
{
@@ -754,34 +754,34 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
removeAllMessages(queue1.getQueueName(), true, 0);
}
-
+
}
-
-
+
+
/**
* Test IllegateStateException is thrown if commit is called on a non-transacted session
*/
public void testCommitIllegalState() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
+
boolean thrown = false;
try
{
@@ -791,11 +791,11 @@
{
thrown = true;
}
-
+
assertTrue(thrown);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -815,28 +815,28 @@
public void testAckNoCommitQueue() throws Exception
{
Connection conn = null;
-
+
try
{
-
+
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
int count = 0;
while (true)
{
@@ -844,20 +844,20 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
-
+
conn.stop();
consumer.close();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
count = 0;
while (true)
{
@@ -865,11 +865,11 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -891,27 +891,27 @@
public void testAckCommitQueue() throws Exception
{
Connection conn = null;
-
- try
- {
+
+ try
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
int count = 0;
while (true)
{
@@ -919,28 +919,28 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
-
+
consumerSess.commit();
-
+
conn.stop();
consumer.close();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
Message m = consumer.receive(500);
-
+
assertNull(m);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -959,35 +959,35 @@
public void testSendRollbackQueue() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
producerSess.rollback();
-
+
Message m = consumer.receive(500);
-
+
assertNull(m);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -1005,13 +1005,13 @@
public void testRollbackIllegalState() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
+
boolean thrown = false;
try
{
@@ -1021,11 +1021,11 @@
{
thrown = true;
}
-
+
assertTrue(thrown);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -1046,20 +1046,20 @@
public void testAckRollbackQueue() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
-
+
//Send some messages
for (int i = 0; i < NUM_MESSAGES; i++)
{
@@ -1074,22 +1074,22 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
-
+
consumerSess.rollback();
-
+
conn.stop();
consumer.close();
-
+
conn.close();
-
+
conn = cf.createConnection();
-
+
consumerSess = conn.createSession(true, Session.CLIENT_ACKNOWLEDGE);
consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
count = 0;
while (true)
{
@@ -1097,12 +1097,12 @@
if (m == null) break;
count++;
}
-
+
assertEquals(NUM_MESSAGES, count);
-
+
}
finally
- {
+ {
if (conn != null)
{
conn.close();
@@ -1119,34 +1119,34 @@
public void testSendMultipleQueue() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = cf.createConnection();
-
+
Session producerSess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = producerSess.createProducer(queue1);
-
+
Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageConsumer consumer = consumerSess.createConsumer(queue1);
conn.start();
-
+
final int NUM_MESSAGES = 10;
final int NUM_TX = 10;
-
+
//Send some messages
-
+
for (int j = 0; j < NUM_TX; j++)
- {
+ {
for (int i = 0; i < NUM_MESSAGES; i++)
{
Message m = producerSess.createMessage();
producer.send(m);
}
-
+
producerSess.commit();
}
-
+
int count = 0;
while (true)
{
@@ -1155,33 +1155,33 @@
count++;
m.acknowledge();
}
-
+
assertEquals(NUM_MESSAGES * NUM_TX, count);
}
finally
- {
+ {
if (conn != null)
{
conn.close();
}
}
}
-
+
// Package protected ---------------------------------------------
-
+
// Protected -----------------------------------------------------
-
+
protected void setUp() throws Exception
{
super.setUp();
-
+
ResourceManagerFactory.instance.clear();
}
-
+
// Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
+
+ // Inner classes -------------------------------------------------
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSReplyToHeaderTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSReplyToHeaderTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSReplyToHeaderTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -25,7 +25,7 @@
import javax.jms.TemporaryQueue;
/**
- *
+ *
* A JMSReplyToHeaderTest
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -39,7 +39,7 @@
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
@@ -57,28 +57,28 @@
Message m = queueProducerSession.createMessage();
TemporaryQueue tempQ = queueProducerSession.createTemporaryQueue();
m.setJMSReplyTo(tempQ);
-
+
queueProducer.send(m);
- queueConsumer.receive(10000);
+ queueConsumer.receive();
assertEquals(tempQ, m.getJMSReplyTo());
}
-
+
public void testJMSDestinationNull() throws Exception
{
Message m = queueProducerSession.createMessage();
m.setJMSReplyTo(null);
-
+
queueProducer.send(m);
- queueConsumer.receive(10000);
+ queueConsumer.receive();
assertNull(m.getJMSReplyTo());
}
-
+
// Package protected ---------------------------------------------
-
+
// Protected -----------------------------------------------------
-
+
// Private -------------------------------------------------------
-
+
// Inner classes -------------------------------------------------
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -36,13 +36,13 @@
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
protected Message message;
-
+
protected Connection conn;
-
+
protected Session session;
protected MessageProducer queueProd;
@@ -61,7 +61,7 @@
public void setUp() throws Exception
{
super.setUp();
-
+
conn = getConnectionFactory().createConnection();
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -73,9 +73,9 @@
public void tearDown() throws Exception
{
- conn.close();
-
- super.tearDown();
+ conn.close();
+
+ super.tearDown();
}
public void testNonPersistentSend() throws Exception
@@ -84,11 +84,11 @@
queueProd.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
queueProd.send(message);
-
+
log.debug("Message sent");
- Message r = queueCons.receive(2000);
-
+ Message r = queueCons.receive();
+
log.debug("Message received");
assertEquals(DeliveryMode.NON_PERSISTENT, r.getJMSDeliveryMode());
@@ -107,7 +107,7 @@
queueProd.send(message);
- Message r = queueCons.receive(500);
+ Message r = queueCons.receive();
assertEquals(DeliveryMode.PERSISTENT, r.getJMSDeliveryMode());
@@ -144,11 +144,11 @@
assertNull(queueCons.receive(100));
-
+
}
// Package protected ---------------------------------------------
-
+
// Protected -----------------------------------------------------
protected void prepareMessage(Message m) throws JMSException
@@ -167,7 +167,7 @@
m.setJMSType("someArbitraryType");
}
-
+
private void assertEquivalent(Message m, int mode) throws JMSException
{
assertEquivalent(m, mode, false);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -45,7 +45,7 @@
// Constants ------------------------------------------------------------------------------------
// Static ---------------------------------------------------------------------------------------
-
+
// Attributes -----------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
@@ -90,7 +90,7 @@
Thread.currentThread().setContextClassLoader(testClassLoader);
- ObjectMessage r = (ObjectMessage) queueCons.receive(2000);
+ ObjectMessage r = (ObjectMessage) queueCons.receive();
Object testObject2 = r.getObject();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -39,7 +39,7 @@
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
@@ -73,7 +73,7 @@
conn.start();
- StreamMessage rm = (StreamMessage)queueCons.receive(2000);
+ StreamMessage rm = (StreamMessage)queueCons.receive();
assertNull(rm.readString());
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -39,7 +39,7 @@
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
-
+
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
@@ -68,13 +68,13 @@
((TextMessage)message).setText("something");
queueProd.send(message);
- TextMessage rm = (TextMessage)queueCons.receive(2000);
+ TextMessage rm = (TextMessage)queueCons.receive();
rm.clearProperties();
assertEquals("something", rm.getText());
}
-
+
// Protected -----------------------------------------------------
protected void prepareMessage(Message m) throws JMSException
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java 2007-12-10 10:13:00 UTC (rev 3451)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java 2007-12-10 10:26:43 UTC (rev 3452)
@@ -63,41 +63,41 @@
public void testSelectiveClosingConsumer() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
-
+
Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = session.createProducer(queue1);
prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
+
String selector = "color = 'red'";
MessageConsumer redConsumer = session.createConsumer(queue1, selector);
conn.start();
-
+
Message redMessage = session.createMessage();
redMessage.setStringProperty("color", "red");
-
+
Message blueMessage = session.createMessage();
blueMessage.setStringProperty("color", "blue");
-
+
prod.send(redMessage);
prod.send(blueMessage);
-
+
Message rec = redConsumer.receive();
assertEquals(redMessage.getJMSMessageID(), rec.getJMSMessageID());
assertEquals("red", rec.getStringProperty("color"));
-
+
assertNull(redConsumer.receive(3000));
-
+
redConsumer.close();
-
+
MessageConsumer universalConsumer = session.createConsumer(queue1);
-
- rec = universalConsumer.receive(2000);
-
+
+ rec = universalConsumer.receive();
+
assertEquals(rec.getJMSMessageID(), blueMessage.getJMSMessageID());
assertEquals("blue", rec.getStringProperty("color"));
}
@@ -115,44 +115,44 @@
String selector1 = "beatle = 'john'";
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
-
+
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons1 = sess.createConsumer(topic1, selector1);
-
+
MessageProducer prod = sess.createProducer(topic1);
-
+
for (int j = 0; j < 100; j++)
{
Message m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
prod.send(m);
}
-
+
for (int j = 0; j < 100; j++)
{
Message m = cons1.receive(1000);
-
+
assertNotNull(m);
}
-
+
Thread.sleep(500);
-
+
Message m = cons1.receiveNoWait();
-
+
assertNull(m);
}
finally
@@ -169,61 +169,61 @@
String selector1 = "beatle = 'john'";
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
-
+
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons1 = sess.createConsumer(queue1, selector1);
-
+
MessageProducer prod = sess.createProducer(queue1);
-
+
for (int j = 0; j < 100; j++)
{
Message m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
prod.send(m);
}
-
+
for (int j = 0; j < 100; j++)
{
Message m = cons1.receive(1000);
-
+
assertNotNull(m);
-
+
assertEquals("john", m.getStringProperty("beatle"));
}
-
+
Message m = cons1.receiveNoWait();
-
+
assertNull(m);
-
+
String selector2 = "beatle = 'kermit the frog'";
-
+
MessageConsumer cons2 = sess.createConsumer(queue1, selector2);
-
+
for (int j = 0; j < 100; j++)
{
m = cons2.receive(1000);
-
+
assertNotNull(m);
-
+
assertEquals("kermit the frog", m.getStringProperty("beatle"));
}
-
+
m = cons2.receiveNoWait();
-
+
assertNull(m);
}
finally
@@ -243,85 +243,85 @@
String selector1 = "beatle = 'john'";
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
-
+
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
int NUM_MESSAGES = 2;
-
+
MessageProducer prod = sess.createProducer(queue1);
-
+
for (int j = 0; j < NUM_MESSAGES; j++)
{
Message m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.setTimeToLive(0);
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.setTimeToLive(1);
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
prod.setTimeToLive(0);
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
m.setJMSExpiration(System.currentTimeMillis());
-
+
prod.setTimeToLive(1);
-
+
prod.send(m);
}
-
+
MessageConsumer cons1 = sess.createConsumer(queue1, selector1);
-
+
for (int j = 0; j < NUM_MESSAGES; j++)
{
Message m = cons1.receive(1000);
-
+
assertNotNull(m);
-
+
assertEquals("john", m.getStringProperty("beatle"));
}
-
+
Message m = cons1.receiveNoWait();
-
+
assertNull(m);
-
+
String selector2 = "beatle = 'kermit the frog'";
-
+
MessageConsumer cons2 = sess.createConsumer(queue1, selector2);
-
+
for (int j = 0; j < NUM_MESSAGES; j++)
{
m = cons2.receive(1000);
-
+
assertNotNull(m);
-
+
assertEquals("kermit the frog", m.getStringProperty("beatle"));
}
-
+
m = cons1.receiveNoWait();
-
+
assertNull(m);
}
finally
@@ -338,46 +338,46 @@
String selector1 = "beatle = 'john'";
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
-
+
for (int i = 0; i < 5; i++)
{
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons1 = sess.createConsumer(topic1, selector1);
-
+
MessageProducer prod = sess.createProducer(topic1);
-
+
for (int j = 0; j < 10; j++)
{
Message m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
prod.send(m);
}
-
+
for (int j = 0; j < 10; j++)
{
Message m = cons1.receive(1000);
-
+
assertNotNull(m);
}
-
+
Message m = cons1.receiveNoWait();
-
+
assertNull(m);
-
+
sess.close();
}
}
@@ -395,47 +395,47 @@
String selector1 = "beatle = 'john'";
Connection conn = null;
-
+
try
{
conn = getConnectionFactory().createConnection();
-
+
conn.start();
-
+
for (int i = 0; i < 5; i++)
{
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
MessageConsumer cons1 = sess.createConsumer(queue1, selector1);
-
+
MessageProducer prod = sess.createProducer(queue1);
-
+
for (int j = 0; j < 10; j++)
{
Message m = sess.createMessage();
-
+
m.setStringProperty("beatle", "john");
-
+
prod.send(m);
-
+
m = sess.createMessage();
-
+
m.setStringProperty("beatle", "kermit the frog");
-
+
prod.send(m);
}
-
+
for (int j = 0; j < 10; j++)
{
Message m = cons1.receive(1000);
-
+
assertNotNull(m);
}
-
+
Message m = cons1.receiveNoWait();
-
+
assertNull(m);
-
+
sess.close();
}
}
@@ -445,7 +445,7 @@
{
conn.close();
}
-
+
removeAllMessages(queue1.getQueueName(), true, 0);
}
}
@@ -459,9 +459,9 @@
String selector5 = "beatle = 'jesus'";
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
conn.start();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -470,55 +470,55 @@
MessageConsumer cons3 = sess.createConsumer(topic1, selector3);
MessageConsumer cons4 = sess.createConsumer(topic1, selector4);
MessageConsumer cons5 = sess.createConsumer(topic1, selector5);
-
+
Message m1 = sess.createMessage();
m1.setStringProperty("beatle", "john");
-
+
Message m2 = sess.createMessage();
m2.setStringProperty("beatle", "paul");
-
+
Message m3 = sess.createMessage();
m3.setStringProperty("beatle", "george");
-
+
Message m4 = sess.createMessage();
m4.setStringProperty("beatle", "ringo");
-
+
Message m5 = sess.createMessage();
m5.setStringProperty("beatle", "jesus");
-
+
MessageProducer prod = sess.createProducer(topic1);
-
+
prod.send(m1);
prod.send(m2);
prod.send(m3);
prod.send(m4);
prod.send(m5);
-
+
Message r1 = cons1.receive(500);
assertNotNull(r1);
Message n = cons1.receive(500);
assertNull(n);
-
+
Message r2 = cons2.receive(500);
assertNotNull(r2);
n = cons2.receive(500);
assertNull(n);
-
+
Message r3 = cons3.receive(500);
assertNotNull(r3);
n = cons3.receive(500);
assertNull(n);
-
+
Message r4 = cons4.receive(500);
assertNotNull(r4);
n = cons4.receive(500);
assertNull(n);
-
+
Message r5 = cons5.receive(500);
assertNotNull(r5);
n = cons5.receive(500);
assertNull(n);
-
+
assertEquals("john", r1.getStringProperty("beatle"));
assertEquals("paul", r2.getStringProperty("beatle"));
assertEquals("george", r3.getStringProperty("beatle"));
@@ -537,33 +537,33 @@
public void testManyConsumersWithDifferentSelectors() throws Exception
{
Connection conn = null;
-
+
try
- {
+ {
conn = getConnectionFactory().createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer p = sess.createProducer(queue1);
-
+
Session cs = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
final MessageConsumer c = cs.createConsumer(queue1, "weight = 1");
-
+
Session cs2 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
final MessageConsumer c2 = cs2.createConsumer(queue1, "weight = 2");
-
+
for(int i = 0; i < 10; i++)
{
Message m = sess.createTextMessage("message" + i);
m.setIntProperty("weight", i % 2 + 1);
p.send(m);
}
-
+
conn.start();
-
+
final List received = new ArrayList();
final List received2 = new ArrayList();
final Latch latch = new Latch();
final Latch latch2 = new Latch();
-
+
new Thread(new Runnable()
{
public void run()
@@ -590,7 +590,7 @@
}
}
}, "consumer thread 1").start();
-
+
new Thread(new Runnable()
{
public void run()
@@ -617,10 +617,10 @@
}
}
}, "consumer thread 2").start();
-
+
latch.acquire();
latch2.acquire();
-
+
assertEquals(5, received.size());
for(Iterator i = received.iterator(); i.hasNext(); )
{
@@ -628,7 +628,7 @@
int value = m.getIntProperty("weight");
assertEquals(value, 1);
}
-
+
assertEquals(5, received2.size());
for(Iterator i = received2.iterator(); i.hasNext(); )
{
@@ -704,5 +704,5 @@
// Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
+ // Inner classes -------------------------------------------------
}
More information about the jboss-cvs-commits
mailing list