[jboss-cvs] JBoss Messaging SVN: r5989 - in trunk/tests/jms-tests/src/org/jboss/test/messaging/jms: stress and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 4 06:06:04 EST 2009
Author: jmesnil
Date: 2009-03-04 06:06:03 -0500 (Wed, 04 Mar 2009)
New Revision: 5989
Modified:
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
Log:
use JMS interfaces instead of JBM classes when declaring objects
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2009-03-04 10:50:22 UTC (rev 5988)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2009-03-04 11:06:03 UTC (rev 5989)
@@ -25,16 +25,15 @@
import javax.jms.Connection;
import javax.jms.InvalidDestinationException;
+import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.QueueBrowser;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.jboss.messaging.jms.JBossQueue;
-
-
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -99,7 +98,13 @@
try
{
- ps.createBrowser(new JBossQueue("NoSuchQueue"));
+ ps.createBrowser(new Queue()
+ {
+ public String getQueueName() throws JMSException
+ {
+ return "NoSuchQueue";
+ }
+ });
fail("should throw exception");
}
catch(InvalidDestinationException e)
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2009-03-04 10:50:22 UTC (rev 5988)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2009-03-04 11:06:03 UTC (rev 5989)
@@ -49,11 +49,6 @@
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.utils.SimpleString;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -556,7 +551,13 @@
try
{
- ps.createConsumer(new JBossTopic("NoSuchTopic"));
+ ps.createConsumer(new Topic()
+ {
+ public String getTopicName() throws JMSException
+ {
+ return "NoSuchTopic";
+ }
+ });
fail("should throw exception");
}
catch (InvalidDestinationException e)
@@ -585,7 +586,13 @@
try
{
- ps.createConsumer(new JBossQueue("NoSuchQueue"));
+ ps.createConsumer(new Queue()
+ {
+ public String getQueueName() throws JMSException
+ {
+ return "NoSuchQueue";
+ }
+ });
fail("should throw exception");
}
catch (InvalidDestinationException e)
@@ -1144,11 +1151,8 @@
Session sess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
MessageProducer prod = sess.createProducer(queue1);
TextMessage tm1 = sess.createTextMessage("hello1");
- ((JBossMessage)tm1).getCoreMessage().putStringProperty(new SimpleString("w"), new SimpleString("msg1"));
TextMessage tm2 = sess.createTextMessage("hello2");
- ((JBossMessage)tm2).getCoreMessage().putStringProperty(new SimpleString("w"), new SimpleString("msg2"));
TextMessage tm3 = sess.createTextMessage("hello3");
- ((JBossMessage)tm3).getCoreMessage().putStringProperty(new SimpleString("w"), new SimpleString("msg3"));
prod.send(tm1);
prod.send(tm2);
prod.send(tm3);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2009-03-04 10:50:22 UTC (rev 5988)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2009-03-04 11:06:03 UTC (rev 5989)
@@ -27,7 +27,6 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -86,7 +85,6 @@
conn.close();
- ObjectName on = new ObjectName("jboss.messaging.destination:service=Queue,name=Queue1");
Integer i = getMessageCountForQueue("Queue1");
assertEquals(1, i.intValue());
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2009-03-04 10:50:22 UTC (rev 5988)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2009-03-04 11:06:03 UTC (rev 5989)
@@ -26,6 +26,7 @@
import java.util.Iterator;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -35,9 +36,7 @@
import javax.naming.InitialContext;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.test.messaging.JBMServerTestCase;
-import org.jboss.test.messaging.jms.ConnectionTest;
/**
* This test was added to test regression on http://jira.jboss.com/jira/browse/JBMESSAGING-660
@@ -47,7 +46,7 @@
*/
public class ConcurrentCloseStressTest extends JBMServerTestCase
{
- private static final Logger log = Logger.getLogger(ConnectionTest.class);
+ private static final Logger log = Logger.getLogger(ConcurrentCloseStressTest.class);
public ConcurrentCloseStressTest(String name)
{
@@ -55,7 +54,7 @@
}
InitialContext ic;
- JBossConnectionFactory cf;
+ ConnectionFactory cf;
Queue queue;
public void setUp() throws Exception
@@ -66,7 +65,7 @@
ic = getInitialContext();
- cf = (JBossConnectionFactory)ic.lookup("/ConnectionFactory");
+ cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
destroyQueue("TestQueue");
createQueue("TestQueue");
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2009-03-04 10:50:22 UTC (rev 5988)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2009-03-04 11:06:03 UTC (rev 5989)
@@ -22,6 +22,7 @@
package org.jboss.test.messaging.jms.stress;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
@@ -34,7 +35,6 @@
import javax.jms.Topic;
import javax.naming.InitialContext;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.utils.UUIDGenerator;
import org.jboss.test.messaging.JBMServerTestCase;
@@ -63,7 +63,7 @@
}
InitialContext ic;
- JBossConnectionFactory cf;
+ ConnectionFactory cf;
Topic topic;
public void setUp() throws Exception
@@ -73,7 +73,7 @@
//ServerManagement.start("all");
ic = getInitialContext();
- cf = (JBossConnectionFactory)ic.lookup("/ConnectionFactory");
+ cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
destroyTopic("TestTopic");
createTopic("TestTopic");
More information about the jboss-cvs-commits
mailing list