You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/03/04 07:16:05 UTC
activemq-artemis git commit: fixing more tests
Repository: activemq-artemis
Updated Branches:
refs/heads/artemis-1009 913ad2b91 -> bc08d7f3a
fixing more tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bc08d7f3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bc08d7f3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bc08d7f3
Branch: refs/heads/artemis-1009
Commit: bc08d7f3aa117a9ffcf445d4bf1daf0b311b773a
Parents: 913ad2b
Author: Clebert Suconic <cl...@apache.org>
Authored: Sat Mar 4 02:15:57 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Sat Mar 4 02:15:57 2017 -0500
----------------------------------------------------------------------
.../protocol/amqp/broker/AMQPMessage.java | 7 +++++
.../protocol/openwire/util/OpenWireUtil.java | 5 ++++
.../tests/integration/client/ConsumerTest.java | 27 ++++++++++++++++++++
3 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bc08d7f3/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 456d281..6cd2d3f 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -609,6 +609,10 @@ public class AMQPMessage extends RefCountMessage {
@Override
public Object getObjectProperty(String key) {
+ if (key.equals("JMSType")) {
+ return getProperties().getSubject();
+ }
+
return getApplicationPropertiesMap().get(key);
}
@@ -624,6 +628,9 @@ public class AMQPMessage extends RefCountMessage {
@Override
public String getStringProperty(String key) throws ActiveMQPropertyConversionException {
+ if (key.equals("JMSType")) {
+ return getProperties().getSubject();
+ }
return (String)getApplicationPropertiesMap().get(key);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bc08d7f3/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java
index 2686907..c84776b 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/util/OpenWireUtil.java
@@ -57,6 +57,11 @@ public class OpenWireUtil {
public static ActiveMQDestination toAMQAddress(Message message, ActiveMQDestination actualDestination) {
String address = message.getAddress();
String strippedAddress = address;//.replace(JMS_QUEUE_ADDRESS_PREFIX, "").replace(JMS_TEMP_QUEUE_ADDRESS_PREFIX, "").replace(JMS_TOPIC_ADDRESS_PREFIX, "").replace(JMS_TEMP_TOPIC_ADDRESS_PREFIX, "");
+
+ if (address == null) {
+ return actualDestination;
+ }
+
if (actualDestination.isQueue()) {
return new ActiveMQQueue(strippedAddress);
} else {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bc08d7f3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
index ed2f2db..b957291 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
@@ -295,6 +295,25 @@ public class ConsumerTest extends ActiveMQTestBase {
System.out.println("Time = " + (end - time));
+ {
+ TextMessage dummyMessage = session.createTextMessage();
+ dummyMessage.setJMSType("car");
+ dummyMessage.setStringProperty("color", "red");
+ dummyMessage.setLongProperty("weight", 3000);
+ dummyMessage.setText("testSelectorExampleFromSpecs:1");
+ producer.send(dummyMessage);
+
+ dummyMessage = session.createTextMessage();
+ dummyMessage.setJMSType("car");
+ dummyMessage.setStringProperty("color", "blue");
+ dummyMessage.setLongProperty("weight", 3000);
+ dummyMessage.setText("testSelectorExampleFromSpecs:2");
+ producer.send(dummyMessage);
+ }
+
+
+
+
connection.close();
if (this.durable) {
@@ -332,6 +351,14 @@ public class ConsumerTest extends ActiveMQTestBase {
BytesMessage bytes = (BytesMessage) consumer.receive(5000);
Assert.assertEquals("string " + i, bytes.readUTF());
}
+
+ consumer.close();
+
+ consumer = session.createConsumer(queue, "JMSType = 'car' AND color = 'blue' AND weight > 2500");
+
+ TextMessage msg = (TextMessage) consumer.receive(1000);
+ Assert.assertEquals("testSelectorExampleFromSpecs:2", msg.getText());
+
} finally {
connection.close();
}