From 593207eb8a184f64b55353f08b9475696acbe08c Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 5 May 2020 18:16:50 -0400 Subject: [PATCH 1/2] NO-JIRA ignore for DS_Store generated from idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2f6e1516a0..0de919a4aa 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ ratReport.txt **/.editorconfig **/derby.log examples/**/readme.html +**/.DS_Store # for native build CMakeCache.txt From ed4086c6871c108ea9e0099c2ae91dc0d315fa65 Mon Sep 17 00:00:00 2001 From: Michael Pearce Date: Tue, 5 May 2020 18:18:37 -0400 Subject: [PATCH 2/2] ARTEMIS-2534 Adding additional test for OpenWire and TempQueue --- .../integration/jms/RedeployTempTest.java | 135 ++++++++++++++++++ .../RedeployTempTest-reload-temp-updated.xml | 121 ++++++++++++++++ .../RedeployTempTest-reload-temp.xml | 121 ++++++++++++++++ 3 files changed, 377 insertions(+) create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTempTest.java create mode 100644 tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp-updated.xml create mode 100644 tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp.xml diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTempTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTempTest.java new file mode 100644 index 0000000000..7ba1746d5e --- /dev/null +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTempTest.java @@ -0,0 +1,135 @@ +/** + * 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.artemis.tests.integration.jms; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.core.server.impl.AddressInfo; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.apache.activemq.artemis.utils.ReusableLatch; +import org.junit.Test; + +public class RedeployTempTest extends ActiveMQTestBase { + + @Test + public void testRedeployAddressQueueOpenWire() throws Exception { + Path brokerXML = getTestDirfile().toPath().resolve("broker.xml"); + URL url1 = RedeployTest.class.getClassLoader().getResource("RedeployTempTest-reload-temp.xml"); + URL url2 = RedeployTest.class.getClassLoader().getResource("RedeployTempTest-reload-temp-updated.xml"); + Files.copy(url1.openStream(), brokerXML); + + EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ(); + embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString()); + embeddedActiveMQ.start(); + + final ReusableLatch latch = new ReusableLatch(1); + + Runnable tick = latch::countDown; + + embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick); + + ConnectionFactory connectionFactory = new org.apache.activemq.ActiveMQConnectionFactory(); + Connection connection = connectionFactory.createConnection(); + connection.start(); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Destination destination = session.createQueue("queue"); + MessageProducer messageProducer = session.createProducer(destination); + + Destination replyTo = session.createTemporaryQueue(); + Message message = session.createTextMessage("hello"); + message.setJMSReplyTo(replyTo); + messageProducer.send(message); + + try { + latch.await(10, TimeUnit.SECONDS); + + Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING); + brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000); + latch.setCount(1); + embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick); + latch.await(10, TimeUnit.SECONDS); + + try (Connection connectionConsumer = connectionFactory.createConnection()) { + connectionConsumer.start(); + try (Session sessionConsumer = connection.createSession(false, Session.AUTO_ACKNOWLEDGE)) { + Destination destinationConsumer = session.createQueue("queue"); + MessageConsumer messageConsumer = sessionConsumer.createConsumer(destinationConsumer); + + Message receivedMessage = messageConsumer.receive(1000); + assertEquals("hello", ((TextMessage) receivedMessage).getText()); + + Destination replyToDest = receivedMessage.getJMSReplyTo(); + Message message1 = sessionConsumer.createTextMessage("hi there"); + + session.createProducer(replyToDest).send(message1); + } + } + + MessageConsumer messageConsumerProducer = session.createConsumer(replyTo); + Message message2 = messageConsumerProducer.receive(1000); + assertEquals("hi there", ((TextMessage) message2).getText()); + + } finally { + connection.close(); + embeddedActiveMQ.stop(); + } + } + + private AddressSettings getAddressSettings(EmbeddedActiveMQ embeddedActiveMQ, String address) { + return embeddedActiveMQ.getActiveMQServer().getAddressSettingsRepository().getMatch(address); + } + + private Set getSecurityRoles(EmbeddedActiveMQ embeddedActiveMQ, String address) { + return embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch(address); + } + + private AddressInfo getAddressInfo(EmbeddedActiveMQ embeddedActiveMQ, String address) { + return embeddedActiveMQ.getActiveMQServer().getPostOffice().getAddressInfo(SimpleString.toSimpleString(address)); + } + + private org.apache.activemq.artemis.core.server.Queue getQueue(EmbeddedActiveMQ embeddedActiveMQ, + String queueName) throws Exception { + QueueBinding queueBinding = (QueueBinding) embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString(queueName)); + return queueBinding == null ? null : queueBinding.getQueue(); + } + + private List listQueuesNamesForAddress(EmbeddedActiveMQ embeddedActiveMQ, String address) throws Exception { + return embeddedActiveMQ.getActiveMQServer().getPostOffice().listQueuesForAddress(SimpleString.toSimpleString(address)).stream().map(org.apache.activemq.artemis.core.server.Queue::getName).map(SimpleString::toString).collect(Collectors.toList()); + } + +} diff --git a/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp-updated.xml b/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp-updated.xml new file mode 100644 index 0000000000..e7c768d91e --- /dev/null +++ b/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp-updated.xml @@ -0,0 +1,121 @@ + + + + + + + + 0.0.0.0 + + 100 + + false + + false + + + NIO + + ./data/paging + + ./data/bindings + + ./data/journal + + ./data/large-messages + + 2 + + -1 + + + 40000 + + + + + + tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576 + + + tcp://0.0.0.0:5672?protocols=AMQP + + + tcp://0.0.0.0:61613?protocols=STOMP + + + tcp://0.0.0.0:5445?protocols=HORNETQ,STOMP + + + tcp://0.0.0.0:1883?protocols=MQTT + + + + + + + + + + + + + + + + + + + + + + false + DLQ + ExpiryQueue + 0 + 10Mb + 10 + BLOCK + FORCE + FORCE + + + + + _ + + + +

+ + + +
+ + + diff --git a/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp.xml b/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp.xml new file mode 100644 index 0000000000..05b7fd30f4 --- /dev/null +++ b/tests/integration-tests/src/test/resources/RedeployTempTest-reload-temp.xml @@ -0,0 +1,121 @@ + + + + + + + + 0.0.0.0 + + 100 + + false + + false + + + NIO + + ./data/paging + + ./data/bindings + + ./data/journal + + ./data/large-messages + + 2 + + -1 + + + 40000 + + + + + + tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576 + + + tcp://0.0.0.0:5672?protocols=AMQP + + + tcp://0.0.0.0:61613?protocols=STOMP + + + tcp://0.0.0.0:5445?protocols=HORNETQ,STOMP + + + tcp://0.0.0.0:1883?protocols=MQTT + + + + + + + + + + + + + + + + + + + + + + false + DLQ + ExpiryQueue + 0 + 10Mb + 10 + BLOCK + FORCE + FORCE + + + + + _ + + + +
+ + + +
+ + +