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

This closes #2477

This commit is contained in:
Clebert Suconic 2019-01-15 17:10:58 -05:00
parent 40da03a9f2 d7eb076d4b
commit ff81f2ebf1
3 changed files with 227 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TemporaryDestinationTest.java Normal file
View File

@ -0,0 +1,207 @@
/*
* 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.client;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Before;
import org.junit.Test;
public class TemporaryDestinationTest extends JMSTestBase {
@Override
@Before
public void setUp() throws Exception {
super.setUp();
}
@Test
public void testTemporaryQueueLeak() throws Exception {
ActiveMQConnection conn = null;
try {
conn = (ActiveMQConnection) createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
MessageProducer producer = producerSession.createProducer(tempQueue);
MessageConsumer consumer = consumerSession.createConsumer(tempQueue);
conn.start();
final String messageText = "This is a message";
javax.jms.Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
assertNotNull(m2);
assertEquals(messageText, m2.getText());
consumer.close();
tempQueue.delete();
assertFalse(conn.containsKnownDestination(SimpleString.toSimpleString(tempQueue.getQueueName())));
assertFalse(conn.containsTemporaryQueue(SimpleString.toSimpleString(tempQueue.getQueueName())));
} finally {
if (conn != null) {
conn.close();
}
}
}
@Test
public void testTemporaryQueueDeletedAfterSessionClosed() throws Exception {
server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false).setAutoCreateQueues(false));
Connection conn = null;
try {
conn = createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Make sure temporary queue cannot be used after it has been deleted
TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
MessageProducer producer = producerSession.createProducer(tempQueue);
MessageConsumer consumer = consumerSession.createConsumer(tempQueue);
conn.start();
final String messageText = "This is a message";
javax.jms.Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
assertNotNull(m2);
assertEquals(messageText, m2.getText());
consumer.close();
consumerSession.close();
producer.close();
producerSession.close();
tempQueue.delete();
producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
producer = producerSession.createProducer(tempQueue);
producer.send(m);
fail();
} catch (JMSException e) {
}
} finally {
if (conn != null) {
conn.close();
}
}
}
@Test
public void testTemporaryTopicDeletedAfterSessionClosed() throws Exception {
server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false).setAutoCreateQueues(false));
Connection conn = null;
try {
conn = createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Make sure temporary topic cannot be used after it has been deleted
TemporaryTopic tempTopic = producerSession.createTemporaryTopic();
MessageProducer producer = producerSession.createProducer(tempTopic);
MessageConsumer consumer = consumerSession.createConsumer(tempTopic);
conn.start();
final String messageText = "This is a message";
javax.jms.Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
assertNotNull(m2);
assertEquals(messageText, m2.getText());
consumer.close();
consumerSession.close();
producer.close();
producerSession.close();
tempTopic.delete();
producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
producer = producerSession.createProducer(tempTopic);
producer.send(m);
fail();
} catch (JMSException e) {
}
} finally {
if (conn != null) {
conn.close();
}
}
}
}

20
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
View File

@ -64,6 +64,7 @@ public class JMSTestBase extends ActiveMQTestBase {
private final Set<JMSContext> contextSet = new HashSet<>();
private final Random random = new Random();
protected InVMNamingContext namingContext;
private final Set<Connection> connectionsSet = new HashSet<>();
protected boolean useSecurity() {
return false;
@ -176,6 +177,15 @@ public class JMSTestBase extends ActiveMQTestBase {
} catch (Exception e) {
// no-op
}
try {
for (Connection localConn : connectionsSet) {
localConn.close();
}
} catch (Exception ignored) {
// no-op
} finally {
connectionsSet.clear();
}
namingContext.close();
jmsServer.stop();
@ -275,4 +285,14 @@ public class JMSTestBase extends ActiveMQTestBase {
}
}
protected final Connection createConnection() throws JMSException {
Connection c = cf.createConnection();
return addConnection(c);
}
protected final Connection addConnection(Connection conn) {
connectionsSet.add(conn);
return conn;
}
}

169
tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
View File

@ -27,9 +27,6 @@ import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
import javax.naming.NamingException;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
@ -128,52 +125,6 @@ public class TemporaryDestinationTest extends JMSTestCase {
}
}
}
@Test
public void testTemporaryQueueLeak() throws Exception {
ActiveMQConnection conn = null;
try {
conn = (ActiveMQConnection) createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
MessageProducer producer = producerSession.createProducer(tempQueue);
MessageConsumer consumer = consumerSession.createConsumer(tempQueue);
conn.start();
final String messageText = "This is a message";
Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
ProxyAssertSupport.assertNotNull(m2);
ProxyAssertSupport.assertEquals(messageText, m2.getText());
consumer.close();
tempQueue.delete();
ProxyAssertSupport.assertFalse(conn.containsKnownDestination(SimpleString.toSimpleString(tempQueue.getQueueName())));
ProxyAssertSupport.assertFalse(conn.containsTemporaryQueue(SimpleString.toSimpleString(tempQueue.getQueueName())));
} finally {
if (conn != null) {
conn.close();
}
}
}
/**
* http://jira.jboss.com/jira/browse/JBMESSAGING-93
*/
@ -313,126 +264,6 @@ public class TemporaryDestinationTest extends JMSTestCase {
}
}
@Test
public void testTemporaryQueueDeletedAfterSessionClosed() throws Exception {
servers.get(0).getActiveMQServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false).setAutoCreateQueues(false));
Connection conn = null;
try {
conn = createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Make sure temporary queue cannot be used after it has been deleted
TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
MessageProducer producer = producerSession.createProducer(tempQueue);
MessageConsumer consumer = consumerSession.createConsumer(tempQueue);
conn.start();
final String messageText = "This is a message";
Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
ProxyAssertSupport.assertNotNull(m2);
ProxyAssertSupport.assertEquals(messageText, m2.getText());
consumer.close();
consumerSession.close();
producer.close();
producerSession.close();
tempQueue.delete();
producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
producer = producerSession.createProducer(tempQueue);
producer.send(m);
ProxyAssertSupport.fail();
} catch (JMSException e) {
}
} finally {
if (conn != null) {
conn.close();
}
}
}
@Test
public void testTemporaryTopicDeletedAfterSessionClosed() throws Exception {
servers.get(0).getActiveMQServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false).setAutoCreateQueues(false));
Connection conn = null;
try {
conn = createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
Session consumerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Make sure temporary topic cannot be used after it has been deleted
TemporaryTopic tempTopic = producerSession.createTemporaryTopic();
MessageProducer producer = producerSession.createProducer(tempTopic);
MessageConsumer consumer = consumerSession.createConsumer(tempTopic);
conn.start();
final String messageText = "This is a message";
Message m = producerSession.createTextMessage(messageText);
producer.send(m);
TextMessage m2 = (TextMessage) consumer.receive(2000);
ProxyAssertSupport.assertNotNull(m2);
ProxyAssertSupport.assertEquals(messageText, m2.getText());
consumer.close();
consumerSession.close();
producer.close();
producerSession.close();
tempTopic.delete();
producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
producer = producerSession.createProducer(tempTopic);
producer.send(m);
ProxyAssertSupport.fail();
} catch (JMSException e) {
}
} finally {
if (conn != null) {
conn.close();
}
}
}
@Test
public void testTemporaryTopicBasic() throws Exception {
Connection conn = null;