[jboss-cvs] JBoss Messaging SVN: r5994 - in trunk/tests/jms-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
Wed Mar 4 09:37:48 EST 2009
Author: jmesnil
Date: 2009-03-04 09:37:48 -0500 (Wed, 04 Mar 2009)
New Revision: 5994
Added:
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java
Modified:
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMessageTest.java
Log:
moved CTSMiscellaneousTest tests to the relevant test cases
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-03-04 13:39:45 UTC (rev 5993)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -139,209 +139,6 @@
// Public --------------------------------------------------------
- public void testForiengMessageSetDestination() throws Exception
- {
- Connection c = null;
-
- try
- {
- c = cf.createConnection();
- Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageProducer p = s.createProducer(queue1);
-
- // create a Bytes foreign message
- SimpleJMSTextMessage txt = new SimpleJMSTextMessage("hello from Brazil!");
- txt.setJMSDestination(null);
-
- p.send(txt);
-
- assertNotNull(txt.getJMSDestination());
-
- MessageConsumer cons = s.createConsumer(queue1);
- c.start();
-
- TextMessage tm = (TextMessage)cons.receive();
- assertNotNull(tm);
- assertEquals("hello from Brazil!", txt.getText());
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- if (c != null)
- {
- c.close();
- }
- }
-
- }
-
- public void testForeignByteMessage() throws Exception
- {
- Connection c = null;
-
- try
- {
- c = cf.createConnection();
- Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageProducer p = s.createProducer(queue1);
-
- // create a Bytes foreign message
- SimpleJMSBytesMessage bfm = new SimpleJMSBytesMessage();
-
- p.send(bfm);
-
- MessageConsumer cons = s.createConsumer(queue1);
- c.start();
-
- BytesMessage bm = (BytesMessage)cons.receive();
- assertNotNull(bm);
- }
- finally
- {
- if (c != null)
- {
- c.close();
- }
- }
-
- }
-
- public void testJMSMessageIDChanged() throws Exception
- {
- Connection c = null;
-
- try
- {
-
- c = cf.createConnection();
- Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageProducer p = s.createProducer(queue1);
-
- Message m = new SimpleJMSMessage();
- m.setJMSMessageID("something");
-
- p.send(m);
-
- assertFalse("something".equals(m.getJMSMessageID()));
-
- c.close();
- }
- finally
- {
- if (c != null)
- {
- c.close();
- }
-
- removeAllMessages(queue1.getQueueName(), true, 0);
- }
- }
-
- /**
- * com.sun.ts.tests.jms.ee.all.queueconn.QueueConnTest line 171
- */
- public void test_1() throws Exception
- {
- QueueConnection qc = null;
-
- try
- {
- qc = cf.createQueueConnection();
- QueueSession qs = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
- QueueReceiver qreceiver = qs.createReceiver(queue1, "targetMessage = TRUE");
-
- qc.start();
-
- TextMessage m = qs.createTextMessage();
- m.setText("one");
- m.setBooleanProperty("targetMessage", false);
-
- QueueSender qsender = qs.createSender(queue1);
-
- qsender.send(m);
-
- m.setText("two");
- m.setBooleanProperty("targetMessage", true);
-
- qsender.send(m);
-
- TextMessage rm = (TextMessage)qreceiver.receive(1000);
-
- assertEquals("two", rm.getText());
- }
- finally
- {
- if (qc != null)
- {
- qc.close();
- }
- Thread.sleep(2000);
- log.info("****** removing merssages");
- removeAllMessages(queue1.getQueueName(), true, 0);
- checkEmpty(queue1);
- }
- }
-
- public void testInvalidSelectorOnDurableSubscription() throws Exception
- {
- Connection c = null;
-
- try
- {
- c = cf.createConnection();
- c.setClientID("something");
-
- Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- try
- {
- s.createDurableSubscriber(topic1, "somename", "=TEST 'test'", false);
- fail("this should fail");
- }
- catch (InvalidSelectorException e)
- {
- // OK
- }
- }
- finally
- {
- c.close();
- }
- }
-
- public void testInvalidSelectorOnSubscription() throws Exception
- {
- TopicConnection c = null;
- try
- {
- c = cf.createTopicConnection();
- c.setClientID("something");
-
- TopicSession s = c.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
- try
- {
- s.createSubscriber(topic1, "=TEST 'test'", false);
- fail("this should fail");
- }
- catch (InvalidSelectorException e)
- {
- // OK
- }
- }
- finally
- {
- c.close();
- }
- }
-
/* By default we send non persistent messages asynchronously for performance reasons
* when running with strictTCK we send them synchronously
*/
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2009-03-04 13:39:45 UTC (rev 5993)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -97,6 +97,11 @@
assertRemainingMessages(0);
}
+ public JMSTestCase()
+ {
+ super();
+ }
+
public JMSTestCase(String name)
{
super(name);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java 2009-03-04 13:39:45 UTC (rev 5993)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.messaging.jms;
+import javax.jms.InvalidSelectorException;
import javax.jms.Session;
import javax.jms.TopicConnection;
import javax.jms.TopicSession;
@@ -118,7 +119,32 @@
}
}
+ public void testInvalidSelectorOnSubscription() throws Exception
+ {
+ TopicConnection c = null;
+ try
+ {
+ c = cf.createTopicConnection();
+ c.setClientID("something");
+ TopicSession s = c.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ try
+ {
+ s.createSubscriber(topic1, "=TEST 'test'", false);
+ fail("this should fail");
+ }
+ catch (InvalidSelectorException e)
+ {
+ // OK
+ }
+ }
+ finally
+ {
+ c.close();
+ }
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Added: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java (rev 0)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.messaging.jms;
+
+import javax.jms.QueueConnection;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+/**
+ *
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ */
+public class QueueReceiverTest extends JMSTestCase
+{
+ // Constants -----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ /**
+ * com.sun.ts.tests.jms.ee.all.queueconn.QueueConnTest line 171
+ */
+ public void testCreateReceiverWithMessageSelector() throws Exception
+ {
+ QueueConnection qc = null;
+
+ try
+ {
+ qc = cf.createQueueConnection();
+ QueueSession qs = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ QueueReceiver qreceiver = qs.createReceiver(queue1, "targetMessage = TRUE");
+
+ qc.start();
+
+ TextMessage m = qs.createTextMessage();
+ m.setText("one");
+ m.setBooleanProperty("targetMessage", false);
+
+ QueueSender qsender = qs.createSender(queue1);
+
+ qsender.send(m);
+
+ m.setText("two");
+ m.setBooleanProperty("targetMessage", true);
+
+ qsender.send(m);
+
+ TextMessage rm = (TextMessage)qreceiver.receive(1000);
+
+ assertEquals("two", rm.getText());
+ }
+ finally
+ {
+ if (qc != null)
+ {
+ qc.close();
+ }
+ Thread.sleep(2000);
+ log.info("****** removing merssages");
+ removeAllMessages(queue1.getQueueName(), true, 0);
+ checkEmpty(queue1);
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java 2009-03-04 13:39:45 UTC (rev 5993)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -52,7 +52,25 @@
// JMS1.1 specs 3.4.3
assertTrue(messageID.startsWith("ID:"));
}
+
+ public void testJMSMessageIDChangedAfterSendingMessage() throws Exception
+ {
+ try
+ {
+ Message m = queueProducerSession.createMessage();;
+ m.setJMSMessageID("ID:something");
+ queueProducer.send(m);
+
+ assertFalse("ID:something".equals(m.getJMSMessageID()));
+
+ }
+ finally
+ {
+ removeAllMessages(queue1.getQueueName(), true, 0);
+ }
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMessageTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMessageTest.java 2009-03-04 13:39:45 UTC (rev 5993)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMessageTest.java 2009-03-04 14:37:48 UTC (rev 5994)
@@ -22,9 +22,11 @@
package org.jboss.test.messaging.jms.message.foreign;
import javax.jms.Message;
+import javax.jms.TextMessage;
import org.jboss.test.messaging.jms.message.MessageTestBase;
import org.jboss.test.messaging.jms.message.SimpleJMSMessage;
+import org.jboss.test.messaging.jms.message.SimpleJMSTextMessage;
/**
@@ -63,4 +65,20 @@
return m;
}
+
+ public void testForeignMessageSetDestination() throws Exception
+ {
+ // create a Bytes foreign message
+ SimpleJMSTextMessage txt = new SimpleJMSTextMessage("hello from Brazil!");
+ txt.setJMSDestination(null);
+
+ queueProd.send(txt);
+
+ assertNotNull(txt.getJMSDestination());
+
+ TextMessage tm = (TextMessage)queueCons.receive();
+ assertNotNull(tm);
+ assertEquals("hello from Brazil!", txt.getText());
+ }
+
}
More information about the jboss-cvs-commits
mailing list