[
https://issues.apache.org/jira/browse/AMQ-8322?focusedWorklogId=786152&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-786152
]
ASF GitHub Bot logged work on AMQ-8322:
---------------------------------------
Author: ASF GitHub Bot
Created on: 29/Jun/22 17:42
Start Date: 29/Jun/22 17:42
Worklog Time Spent: 10m
Work Description: mattrpav commented on code in PR #729:
URL: https://github.com/apache/activemq/pull/729#discussion_r910240234
##########
activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2MessageTypesTest.java:
##########
@@ -0,0 +1,582 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.jms2;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.IllegalStateRuntimeException;
+import javax.jms.JMSConsumer;
+import javax.jms.JMSContext;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.Topic;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(value = Parameterized.class)
+public class ActiveMQJMS2MessageTypesTest extends ActiveMQJMS2TestBase {
+
+ private final String clientID;
+ private final String destinationType;
+ private final String messagePayload;
+ private final String messageType;
+
+ public ActiveMQJMS2MessageTypesTest(String destinationType, String
messageType) {
+ this.clientID = destinationType + "-" + messageType;
+ this.destinationType = destinationType;
+ this.messagePayload = "Test message payload";
+ this.messageType = messageType;
+ }
+
+ @Parameterized.Parameters(name="destinationType={0}, messageType={1}")
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {"queue", "bytes"},
+ {"queue", "map"},
+ {"queue", "object"},
+ {"queue", "stream"},
+ {"queue", "text"},
+ {"topic", "bytes"},
+ {"topic", "map"},
+ {"topic", "object"},
+ {"topic", "stream"},
+ {"topic", "text"},
+ {"temp-queue", "bytes"},
+ {"temp-queue", "map"},
+ {"temp-queue", "object"},
+ {"temp-queue", "stream"},
+ {"temp-queue", "text"},
+ {"temp-topic", "bytes"},
+ {"temp-topic", "map"},
+ {"temp-topic", "object"},
+ {"temp-topic", "stream"},
+ {"temp-topic", "text"},
+ });
+ }
+
+ @Test
+ public void testMessageDeliveryMode() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+
+ List<String> sentMessageIds = new LinkedList<>();
+ for(int deliveryMode : Arrays.asList(DeliveryMode.NON_PERSISTENT,
DeliveryMode.PERSISTENT)) {
+
sentMessageIds.add(ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination,
message, null, deliveryMode, null, null, null, null, null, null, null));
+ }
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 50;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 2) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int foundCount = 0;
+ for(int validDeliveryMode :
Arrays.asList(DeliveryMode.NON_PERSISTENT, DeliveryMode.PERSISTENT)) {
+ for(javax.jms.Message tmpMessage : recvMessages) {
+ if(tmpMessage.getJMSDeliveryMode() == validDeliveryMode) {
+
ActiveMQJMS2TestSupport.validateMessageDeliveryMode(tmpMessage, messageType,
messagePayload, validDeliveryMode);
+ foundCount++;
+ }
+ }
+ }
+ assertEquals(Integer.valueOf(2), Integer.valueOf(foundCount));
+ jmsConsumer.close();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessageDeliveryModeInvalid() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+ boolean caught = false;
+ try {
+ ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination,
message, null, 99, null, null, null, null, null, null, null);
+ fail("IlegalStateRuntimeException expected");
+ } catch (IllegalStateRuntimeException e) {
+ assertEquals("unknown delivery mode: 99", e.getMessage());
+ caught = true;
+ }
+ assertTrue(caught);
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessagePriority() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+
+ List<String> sentMessageIds = new LinkedList<>();
+ for(int priority=0; priority<10; priority++) {
+
sentMessageIds.add(ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination,
message, null, null, null, null, null, null, null, priority, null));
+ }
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 50;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 10) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int foundCount = 0;
+ for(int
validatedPriority=0;validatedPriority<10;validatedPriority++) {
+ for(javax.jms.Message tmpMessage : recvMessages) {
+ if(tmpMessage.getJMSPriority() == validatedPriority) {
+
ActiveMQJMS2TestSupport.validateMessagePriority(tmpMessage, messageType,
messagePayload, validatedPriority);
+ foundCount++;
+ }
+ }
+ }
+ assertEquals(Integer.valueOf(10), Integer.valueOf(foundCount));
+ jmsConsumer.close();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessagePriorityInvalidLower() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+ boolean caught = false;
+ try {
+ ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination,
message, null, null, null, null, null, null, null, -1, null);
+ fail("IlegalStateRuntimeException expected");
+ } catch (IllegalStateRuntimeException e) {
+ assertEquals("default priority must be a value between 0 and
9", e.getMessage());
+ caught = true;
+ }
+ assertTrue(caught);
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessagePriorityInvalidHigher() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+ boolean caught = false;
+ try {
+ ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination,
message, null, null, true, null, null, null, null, 10, null);
+ fail("IlegalStateRuntimeException expected");
+ } catch (IllegalStateRuntimeException e) {
+ assertEquals("default priority must be a value between 0 and
9", e.getMessage());
+ caught = true;
+ }
+ assertTrue(caught);
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessageTimestampTimeToLive() {
+
+ long timeToLive = 900000l;
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+
+ List<String> sentMessageIds = new LinkedList<>();
+ long messageExpiration = Long.MIN_VALUE;
+ long messageTimestamp = Long.MIN_VALUE;
+ sentMessageIds.add(ActiveMQJMS2TestSupport.sendMessage(jmsContext,
destination, message, null, null, null, null, null, null, null, null,
timeToLive));
+ messageExpiration = message.getJMSExpiration();
+ messageTimestamp = message.getJMSTimestamp();
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 10;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 1) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int validatedCount = 0;
+ for(javax.jms.Message tmpMessage : recvMessages) {
+
ActiveMQJMS2TestSupport.validateMessageExpirationTimestamp(tmpMessage,
messageType, messagePayload, messageExpiration, messageTimestamp);
+ validatedCount++;
+ }
+ assertEquals(Integer.valueOf(1), Integer.valueOf(validatedCount));
+ jmsConsumer.close();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessageDisableTimestamp() {
+
+ long timeToLive = 900000l;
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+
+ List<String> sentMessageIds = new LinkedList<>();
+ long messageExpiration = Long.MIN_VALUE;
+ long messageTimestamp = Long.MIN_VALUE;
+ sentMessageIds.add(ActiveMQJMS2TestSupport.sendMessage(jmsContext,
destination, message, null, null, null, true, null, null, null, null,
timeToLive));
+ messageExpiration = message.getJMSExpiration();
+ messageTimestamp = message.getJMSTimestamp();
+ assertEquals(0l, messageTimestamp);
+ assertNotEquals(Long.MIN_VALUE, messageExpiration);
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 10;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 1) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int validatedCount = 0;
+ for(javax.jms.Message tmpMessage : recvMessages) {
+ assertEquals(0l, messageTimestamp);
+ assertNotEquals(Long.MIN_VALUE, messageExpiration);
+
ActiveMQJMS2TestSupport.validateMessageExpirationTimestamp(tmpMessage,
messageType, messagePayload, messageExpiration, messageTimestamp);
+ validatedCount++;
+ }
+ assertEquals(Integer.valueOf(1), Integer.valueOf(validatedCount));
+ jmsConsumer.close();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+
+ @Test
+ public void testMessageNonQOSHeaders() {
+
+ String jmsCorrelationID = UUID.randomUUID().toString();
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+ Destination jmsReplyTo =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName + ".REPLYTO");
+ String jmsType = message.getClass().getName();
+
+ List<String> sentMessageIds = new LinkedList<>();
+ sentMessageIds.add(ActiveMQJMS2TestSupport.sendMessage(jmsContext,
destination, message, null, null, null, null, jmsCorrelationID, jmsReplyTo,
jmsType, null, null));
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 10;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 1) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int validatedCount = 0;
+ for(javax.jms.Message tmpMessage : recvMessages) {
+
ActiveMQJMS2TestSupport.validateMessageNonQOSHeaders(tmpMessage, messageType,
messagePayload, jmsCorrelationID, jmsReplyTo, jmsType);
+ validatedCount++;
+ }
+ assertEquals(Integer.valueOf(1), Integer.valueOf(validatedCount));
+ jmsConsumer.close();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testMessageDisableMessageID() {
+
+ try(JMSContext jmsContext =
activemqConnectionFactory.createContext("admin", "admin",
Session.AUTO_ACKNOWLEDGE)) {
+ assertNotNull(jmsContext);
+ Destination destination =
ActiveMQJMS2TestSupport.generateDestination(jmsContext, destinationType,
methodNameDestinationName);
+ assertNotNull(destination);
+ JMSConsumer jmsConsumer = jmsContext.createConsumer(destination);
+ assertNotNull(jmsConsumer);
+ jmsContext.start();
+
+ Message message =
ActiveMQJMS2TestSupport.generateMessage(jmsContext, messageType,
messagePayload);
+ String jmsMessageID =
(ActiveMQJMS2TestSupport.sendMessage(jmsContext, destination, message, null,
null, true, null, null, null, null, null, null));
+
+ Message recvMessage = null;
+ List<Message> recvMessages = new LinkedList<>();
+ int loopCount = 0;
+ int maxLoops = 10;
+ boolean done = false;
+ do {
+ recvMessage = jmsConsumer.receive(500l);
+ if(recvMessage != null) {
+ recvMessages.add(recvMessage);
+ }
+
+ if(recvMessages.size() == 1) {
+ done = true;
+ }
+ loopCount++;
+ } while (loopCount <= maxLoops && !done);
+
+ int validatedCount = 0;
+ for(javax.jms.Message tmpMessage : recvMessages) {
+
ActiveMQJMS2TestSupport.validateMessageDisableMessageID(tmpMessage,
messageType, messagePayload, jmsMessageID);
Review Comment:
Yes, for completeness against the spec changes. This is negative testing the
optional DisableMessageID support. Also, in the (unlikely) event that an effort
comes along to add support for messageID-less delivery these will fail.
Issue Time Tracking
-------------------
Worklog Id: (was: 786152)
Time Spent: 15h 10m (was: 15h)
> Implement JMS 2.0 Connection createContext methods
> --------------------------------------------------
>
> Key: AMQ-8322
> URL: https://issues.apache.org/jira/browse/AMQ-8322
> Project: ActiveMQ
> Issue Type: New Feature
> Reporter: Matt Pavlovich
> Assignee: Matt Pavlovich
> Priority: Major
> Labels: #jms2
> Fix For: 5.18.0
>
> Time Spent: 15h 10m
> Remaining Estimate: 0h
>
> Add support for JMSContext, JMSProducer and JMSConsumer for working with
> queues
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
