Repository: activemq-6 Updated Branches: refs/heads/master db5fd9ddd -> aa638197c
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java index ef21750..6068955 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java @@ -156,7 +156,7 @@ public class GroupingTest extends JMSTestBase message.setText("Message" + j); - message.setStringProperty("_HQ_GROUP_ID", "" + (j % 10)); + message.setStringProperty("_AMQ_GROUP_ID", "" + (j % 10)); producer.send(message); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java index edfcfcb..63a8dba 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java @@ -86,7 +86,7 @@ public class JMSLargeMessageTest extends JMSTestBase BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_HQ_InputStream", UnitTestCase.createFakeLargeStream(1024 * 1024)); + m.setObjectProperty("JMS_AMQ_InputStream", UnitTestCase.createFakeLargeStream(1024 * 1024)); prod.send(m); @@ -130,7 +130,7 @@ public class JMSLargeMessageTest extends JMSTestBase BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_HQ_InputStream", UnitTestCase.createFakeLargeStream(10)); + m.setObjectProperty("JMS_AMQ_InputStream", UnitTestCase.createFakeLargeStream(10)); prod.send(m); @@ -171,7 +171,7 @@ public class JMSLargeMessageTest extends JMSTestBase try { - msg.setObjectProperty("JMS_HQ_InputStream", UnitTestCase.createFakeLargeStream(10)); + msg.setObjectProperty("JMS_AMQ_InputStream", UnitTestCase.createFakeLargeStream(10)); Assert.fail("Exception was expected"); } catch (JMSException e) @@ -198,7 +198,7 @@ public class JMSLargeMessageTest extends JMSTestBase try { - rm.setObjectProperty("JMS_HQ_OutputStream", new OutputStream() + rm.setObjectProperty("JMS_AMQ_OutputStream", new OutputStream() { @Override public void write(final int b) throws IOException @@ -232,7 +232,7 @@ public class JMSLargeMessageTest extends JMSTestBase BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_HQ_InputStream", UnitTestCase.createFakeLargeStream(msgSize)); + m.setObjectProperty("JMS_AMQ_InputStream", UnitTestCase.createFakeLargeStream(msgSize)); prod.send(m); @@ -273,14 +273,14 @@ public class JMSLargeMessageTest extends JMSTestBase try { - rm.setObjectProperty("JMS_HQ_InputStream", UnitTestCase.createFakeLargeStream(100)); + rm.setObjectProperty("JMS_AMQ_InputStream", UnitTestCase.createFakeLargeStream(100)); Assert.fail("Exception expected!"); } catch (MessageNotWriteableException expected) { } - rm.setObjectProperty("JMS_HQ_SaveStream", out); + rm.setObjectProperty("JMS_AMQ_SaveStream", out); Assert.assertEquals(msgSize, numberOfBytes.get()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java index a5f1b43..68d33fb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java @@ -90,14 +90,14 @@ public class ManagementWithStompTest extends ManagementTestBase // retrieve the address of the queue frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" + "reply-to:" + address + "\n" + - "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + - "_HQ_Attribute: Address\n\n" + + "_AMQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + + "_AMQ_Attribute: Address\n\n" + Stomp.NULL; sendFrame(frame); frame = receiveFrame(10000); System.out.println(frame); - assertTrue(frame.contains("_HQ_OperationSucceeded:true")); + assertTrue(frame.contains("_AMQ_OperationSucceeded:true")); // the address will be returned in the message body in a JSON array Assert.assertTrue(frame.contains("[\"" + address + "\"]")); @@ -133,15 +133,15 @@ public class ManagementWithStompTest extends ManagementTestBase // count number of message with filter "color = 'blue'" frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" + "reply-to:" + address + "\n" + - "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + - "_HQ_OperationName: countMessages\n\n" + + "_AMQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + + "_AMQ_OperationName: countMessages\n\n" + "[\"color = 'blue'\"]" + Stomp.NULL; sendFrame(frame); frame = receiveFrame(10000); System.out.println(frame); - assertTrue(frame.contains("_HQ_OperationSucceeded:true")); + assertTrue(frame.contains("_AMQ_OperationSucceeded:true")); // there is no such messages => 0 returned in a JSON array assertTrue(frame.contains("[0]")); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java index 17a1943..cf27406 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java @@ -748,7 +748,7 @@ public class ExtraStompTest extends StompTestBase while (enu.hasMoreElements()) { Message msg = (Message) enu.nextElement(); - String msgId = msg.getStringProperty("hqMessageId"); + String msgId = msg.getStringProperty("amqMessageId"); if (enable != null && enable.booleanValue()) { assertNotNull(msgId); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java index 0295095..8e111fd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java @@ -335,7 +335,7 @@ public class TransferMessageTest extends ClusterTestBase "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest", "output-result", "500", "100", - "_HQ_TOOL_original_address='queues.testaddress'"); + "_AMQ_TOOL_original_address='queues.testaddress'"); ClientSession session = sfs[0].createSession(false, false); @@ -371,7 +371,7 @@ public class TransferMessageTest extends ClusterTestBase "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest", "output-result", "500", "100", - "_HQ_TOOL_original_address='queues2.testaddress'"); + "_AMQ_TOOL_original_address='queues2.testaddress'"); session.start(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/188e3b76/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java index 06c03f1..e5020b2 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java @@ -52,20 +52,20 @@ public class SelectorTranslatorTest extends UnitTestCase { String selector = "JMSDeliveryMode='NON_PERSISTENT'"; - Assert.assertEquals("HQDurable='NON_DURABLE'", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQDurable='NON_DURABLE'", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = "JMSDeliveryMode='PERSISTENT'"; - Assert.assertEquals("HQDurable='DURABLE'", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQDurable='DURABLE'", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = "color = 'red' AND 'NON_PERSISTENT' = JMSDeliveryMode"; - Assert.assertEquals("color = 'red' AND 'NON_DURABLE' = HQDurable", + Assert.assertEquals("color = 'red' AND 'NON_DURABLE' = AMQDurable", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = "color = 'red' AND 'PERSISTENT' = JMSDeliveryMode"; - Assert.assertEquals("color = 'red' AND 'DURABLE' = HQDurable", + Assert.assertEquals("color = 'red' AND 'DURABLE' = AMQDurable", SelectorTranslator.convertToActiveMQFilterString(selector)); checkNoSubstitute("JMSDeliveryMode"); @@ -76,22 +76,22 @@ public class SelectorTranslatorTest extends UnitTestCase { String selector = "JMSPriority=5"; - Assert.assertEquals("HQPriority=5", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQPriority=5", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSPriority = 7"; - Assert.assertEquals(" HQPriority = 7", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" AMQPriority = 7", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSPriority = 7 OR 1 = JMSPriority AND (JMSPriority= 1 + 4)"; - Assert.assertEquals(" HQPriority = 7 OR 1 = HQPriority AND (HQPriority= 1 + 4)", + Assert.assertEquals(" AMQPriority = 7 OR 1 = AMQPriority AND (AMQPriority= 1 + 4)", SelectorTranslator.convertToActiveMQFilterString(selector)); checkNoSubstitute("JMSPriority"); selector = "animal = 'lion' JMSPriority = 321 OR animal_name = 'xyzJMSPriorityxyz'"; - Assert.assertEquals("animal = 'lion' HQPriority = 321 OR animal_name = 'xyzJMSPriorityxyz'", + Assert.assertEquals("animal = 'lion' AMQPriority = 321 OR animal_name = 'xyzJMSPriorityxyz'", SelectorTranslator.convertToActiveMQFilterString(selector)); } @@ -99,25 +99,25 @@ public class SelectorTranslatorTest extends UnitTestCase @Test public void testParseJMSMessageID() { - String selector = "JMSMessageID='ID:HQ-12435678"; + String selector = "JMSMessageID='ID:AMQ-12435678"; - Assert.assertEquals("HQUserID='ID:HQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQUserID='ID:AMQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " JMSMessageID='ID:HQ-12435678"; + selector = " JMSMessageID='ID:AMQ-12435678"; - Assert.assertEquals(" HQUserID='ID:HQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" AMQUserID='ID:AMQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " JMSMessageID = 'ID:HQ-12435678"; + selector = " JMSMessageID = 'ID:AMQ-12435678"; - Assert.assertEquals(" HQUserID = 'ID:HQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" AMQUserID = 'ID:AMQ-12435678", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " myHeader = JMSMessageID"; - Assert.assertEquals(" myHeader = HQUserID", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" myHeader = AMQUserID", SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " myHeader = JMSMessageID OR (JMSMessageID = 'ID-HQ' + '12345')"; + selector = " myHeader = JMSMessageID OR (JMSMessageID = 'ID-AMQ' + '12345')"; - Assert.assertEquals(" myHeader = HQUserID OR (HQUserID = 'ID-HQ' + '12345')", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" myHeader = AMQUserID OR (AMQUserID = 'ID-AMQ' + '12345')", SelectorTranslator.convertToActiveMQFilterString(selector)); checkNoSubstitute("JMSMessageID"); } @@ -127,22 +127,22 @@ public class SelectorTranslatorTest extends UnitTestCase { String selector = "JMSTimestamp=12345678"; - Assert.assertEquals("HQTimestamp=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQTimestamp=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSTimestamp=12345678"; - Assert.assertEquals(" HQTimestamp=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" AMQTimestamp=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSTimestamp=12345678 OR 78766 = JMSTimestamp AND (JMSTimestamp= 1 + 4878787)"; - Assert.assertEquals(" HQTimestamp=12345678 OR 78766 = HQTimestamp AND (HQTimestamp= 1 + 4878787)", + Assert.assertEquals(" AMQTimestamp=12345678 OR 78766 = AMQTimestamp AND (AMQTimestamp= 1 + 4878787)", SelectorTranslator.convertToActiveMQFilterString(selector)); checkNoSubstitute("JMSTimestamp"); selector = "animal = 'lion' JMSTimestamp = 321 OR animal_name = 'xyzJMSTimestampxyz'"; - Assert.assertEquals("animal = 'lion' HQTimestamp = 321 OR animal_name = 'xyzJMSTimestampxyz'", + Assert.assertEquals("animal = 'lion' AMQTimestamp = 321 OR animal_name = 'xyzJMSTimestampxyz'", SelectorTranslator.convertToActiveMQFilterString(selector)); } @@ -152,22 +152,22 @@ public class SelectorTranslatorTest extends UnitTestCase { String selector = "JMSExpiration=12345678"; - Assert.assertEquals("HQExpiration=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals("AMQExpiration=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSExpiration=12345678"; - Assert.assertEquals(" HQExpiration=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); + Assert.assertEquals(" AMQExpiration=12345678", SelectorTranslator.convertToActiveMQFilterString(selector)); selector = " JMSExpiration=12345678 OR 78766 = JMSExpiration AND (JMSExpiration= 1 + 4878787)"; - Assert.assertEquals(" HQExpiration=12345678 OR 78766 = HQExpiration AND (HQExpiration= 1 + 4878787)", + Assert.assertEquals(" AMQExpiration=12345678 OR 78766 = AMQExpiration AND (AMQExpiration= 1 + 4878787)", SelectorTranslator.convertToActiveMQFilterString(selector)); checkNoSubstitute("JMSExpiration"); selector = "animal = 'lion' JMSExpiration = 321 OR animal_name = 'xyzJMSExpirationxyz'"; - Assert.assertEquals("animal = 'lion' HQExpiration = 321 OR animal_name = 'xyzJMSExpirationxyz'", + Assert.assertEquals("animal = 'lion' AMQExpiration = 321 OR animal_name = 'xyzJMSExpirationxyz'", SelectorTranslator.convertToActiveMQFilterString(selector)); } @@ -175,15 +175,15 @@ public class SelectorTranslatorTest extends UnitTestCase @Test public void testParseJMSCorrelationID() { - String selector = "JMSCorrelationID='ID:HQ-12435678"; + String selector = "JMSCorrelationID='ID:AMQ-12435678"; Assert.assertEquals(selector, SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " JMSCorrelationID='ID:HQ-12435678"; + selector = " JMSCorrelationID='ID:AMQ-12435678"; Assert.assertEquals(selector, SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " JMSCorrelationID = 'ID:HQ-12435678"; + selector = " JMSCorrelationID = 'ID:AMQ-12435678"; Assert.assertEquals(selector, SelectorTranslator.convertToActiveMQFilterString(selector)); @@ -191,7 +191,7 @@ public class SelectorTranslatorTest extends UnitTestCase Assert.assertEquals(selector, SelectorTranslator.convertToActiveMQFilterString(selector)); - selector = " myHeader = JMSCorrelationID OR (JMSCorrelationID = 'ID-HQ' + '12345')"; + selector = " myHeader = JMSCorrelationID OR (JMSCorrelationID = 'ID-AMQ' + '12345')"; Assert.assertEquals(selector, SelectorTranslator.convertToActiveMQFilterString(selector));
