Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce the use of QPid JMS specific types in this test.

This commit is contained in:
Timothy Bish 2014-03-27 10:32:03 -04:00
parent c07514f570
commit 359ec25e21
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4563Test.java
View File

@ -30,6 +30,7 @@ import javax.jms.JMSException;
import javax.jms.Message; import javax.jms.Message;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;
import javax.jms.MessageProducer; import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TextMessage; import javax.jms.TextMessage;
@ -52,13 +53,12 @@ public class AMQ4563Test extends AmqpTestSupport {
public void testMessagesAreAckedAMQProducer() throws Exception { public void testMessagesAreAckedAMQProducer() throws Exception {
int messagesSent = 3; int messagesSent = 3;
ActiveMQAdmin.enableJMSFrameTracing(); ActiveMQAdmin.enableJMSFrameTracing();
QueueImpl queue = new QueueImpl("queue://txqueue");
assertTrue(brokerService.isPersistent()); assertTrue(brokerService.isPersistent());
Connection connection = createAMQConnection(); Connection connection = createAMQConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Destination destination = session.createQueue("txqueue"); Queue queue = session.createQueue("txqueue");
MessageProducer p = session.createProducer(destination); MessageProducer p = session.createProducer(queue);
TextMessage message = null; TextMessage message = null;
for (int i=0; i < messagesSent; i++) { for (int i=0; i < messagesSent; i++) {
message = session.createTextMessage(); message = session.createTextMessage();
@ -69,26 +69,26 @@ public class AMQ4563Test extends AmqpTestSupport {
} }
// After the first restart we should get all messages sent above // After the first restart we should get all messages sent above
QueueImpl qpidQueue = new QueueImpl("queue://txqueue");
restartBroker(connection, session); restartBroker(connection, session);
int messagesReceived = readAllMessages(queue); int messagesReceived = readAllMessages(qpidQueue);
assertEquals(messagesSent, messagesReceived); assertEquals(messagesSent, messagesReceived);
// This time there should be no messages on this queue // This time there should be no messages on this queue
restartBroker(connection, session); restartBroker(connection, session);
messagesReceived = readAllMessages(queue); messagesReceived = readAllMessages(qpidQueue);
assertEquals(0, messagesReceived); assertEquals(0, messagesReceived);
} }
@Test(timeout = 60000) @Test(timeout = 60000)
public void testSelectingOnAMQPMessageID() throws Exception { public void testSelectingOnAMQPMessageID() throws Exception {
ActiveMQAdmin.enableJMSFrameTracing(); ActiveMQAdmin.enableJMSFrameTracing();
QueueImpl queue = new QueueImpl("queue://txqueue");
assertTrue(brokerService.isPersistent()); assertTrue(brokerService.isPersistent());
Connection connection = createAMQPConnection(); Connection connection = createAMQPConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Destination destination = session.createQueue("txqueue"); Queue queue = session.createQueue("txqueue");
MessageProducer p = session.createProducer(destination); MessageProducer p = session.createProducer(queue);
TextMessage message = session.createTextMessage(); TextMessage message = session.createTextMessage();
String messageText = "Hello sent at " + new java.util.Date().toString(); String messageText = "Hello sent at " + new java.util.Date().toString();
message.setText(messageText); message.setText(messageText);
@ -129,11 +129,11 @@ public class AMQ4563Test extends AmqpTestSupport {
public void testMessagesAreAckedAMQPProducer() throws Exception { public void testMessagesAreAckedAMQPProducer() throws Exception {
int messagesSent = 3; int messagesSent = 3;
ActiveMQAdmin.enableJMSFrameTracing(); ActiveMQAdmin.enableJMSFrameTracing();
QueueImpl queue = new QueueImpl("queue://txqueue");
assertTrue(brokerService.isPersistent()); assertTrue(brokerService.isPersistent());
Connection connection = createAMQPConnection(); Connection connection = createAMQPConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("txqueue");
MessageProducer p = session.createProducer(queue); MessageProducer p = session.createProducer(queue);
TextMessage message = null; TextMessage message = null;
for (int i=0; i < messagesSent; i++) { for (int i=0; i < messagesSent; i++) {
@ -155,11 +155,11 @@ public class AMQ4563Test extends AmqpTestSupport {
assertEquals(0, messagesReceived); assertEquals(0, messagesReceived);
} }
private int readAllMessages(QueueImpl queue) throws JMSException { private int readAllMessages(Queue queue) throws JMSException {
return readAllMessages(queue, null); return readAllMessages(queue, null);
} }
private int readAllMessages(QueueImpl queue, String selector) throws JMSException { private int readAllMessages(Queue queue, String selector) throws JMSException {
Connection connection = createAMQPConnection(); Connection connection = createAMQPConnection();
try { try {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@ -231,6 +231,7 @@ public class AMQ4563Test extends AmqpTestSupport {
/** /**
* Copied from AmqpTestSupport, modified to use persistence * Copied from AmqpTestSupport, modified to use persistence
*/ */
@Override
public void createBroker(boolean deleteAllMessages) throws Exception { public void createBroker(boolean deleteAllMessages) throws Exception {
KahaDBStore kaha = new KahaDBStore(); KahaDBStore kaha = new KahaDBStore();
kaha.setDirectory(new File(KAHADB_DIRECTORY)); kaha.setDirectory(new File(KAHADB_DIRECTORY));