activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [3/3] activemq-artemis git commit: ARTEMIS-789 tests/fixes for auto create/delete
Date Thu, 15 Dec 2016 22:56:42 GMT
ARTEMIS-789 tests/fixes for auto create/delete


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6cb6e95c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6cb6e95c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6cb6e95c

Branch: refs/heads/master
Commit: 6cb6e95c9b7fad3d8582d822d576fc9c829b7487
Parents: ce4f9b5
Author: jbertram <jbertram@apache.org>
Authored: Thu Dec 15 11:43:02 2016 -0600
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Dec 15 17:53:50 2016 -0500

----------------------------------------------------------------------
 .../core/server/impl/ActiveMQServerImpl.java    | 18 +++++-
 .../client/AutoDeleteAddressTest.java           | 66 ++++++++++++++++++++
 .../integration/client/AutoDeleteQueueTest.java | 66 ++++++++++++++++++++
 3 files changed, 147 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6cb6e95c/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 76ba050..bfe57e3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1561,9 +1561,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
                             final boolean temporary,
                             final boolean autoCreated) throws Exception {
       AddressSettings as = getAddressSettingsRepository().getMatch(address.toString());
-      return createQueue(address, routingType, queueName, filterString, user, durable, temporary,
+      return createQueue(address, routingType, queueName, filterString, user, durable, temporary,
autoCreated,
                          as.getDefaultMaxConsumers(),
-                         as.isDefaultDeleteOnNoConsumers(), autoCreated);
+                         as.isDefaultDeleteOnNoConsumers(), as.isAutoCreateAddresses());
    }
 
    @Override
@@ -1725,7 +1725,19 @@ public class ActiveMQServerImpl implements ActiveMQServer {
                             final SecurityAuth session,
                             final boolean checkConsumerCount,
                             final boolean removeConsumers) throws Exception {
-      destroyQueue(queueName, session, checkConsumerCount, removeConsumers, true);
+      if (postOffice == null) {
+         return;
+      }
+
+      Binding binding = postOffice.getBinding(queueName);
+
+      if (binding == null) {
+         throw ActiveMQMessageBundle.BUNDLE.noSuchQueue(queueName);
+      }
+
+      String address = binding.getAddress().toString();
+
+      destroyQueue(queueName, session, checkConsumerCount, removeConsumers, addressSettingsRepository.getMatch(address).isAutoDeleteAddresses());
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6cb6e95c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteAddressTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteAddressTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteAddressTest.java
new file mode 100644
index 0000000..a66f069
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteAddressTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.client;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.RoutingType;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AutoDeleteAddressTest extends ActiveMQTestBase {
+
+   public final SimpleString addressA = new SimpleString("addressA");
+   public final SimpleString queueA = new SimpleString("queueA");
+
+   private ServerLocator locator;
+   private ActiveMQServer server;
+   private ClientSessionFactory cf;
+
+   @Override
+   @Before
+   public void setUp() throws Exception {
+      super.setUp();
+      locator = createInVMNonHALocator();
+      server = createServer(false);
+
+      server.start();
+      cf = createSessionFactory(locator);
+   }
+
+   @Test
+   public void testAutoDeleteAutoCreatedAddress() throws Exception {
+      // auto-delete-addresses defaults to true
+      server.createQueue(addressA, RoutingType.ANYCAST, queueA, null, null, true, false,
true);
+      assertNotNull(server.getAddressInfo(addressA));
+      cf.createSession().createConsumer(queueA).close();
+      assertNull(server.getAddressInfo(addressA));
+   }
+
+   @Test
+   public void testNegativeAutoDeleteAutoCreatedAddress() throws Exception {
+      server.getAddressSettingsRepository().addMatch(addressA.toString(), new AddressSettings().setAutoDeleteAddresses(false));
+      server.createQueue(addressA, RoutingType.ANYCAST, queueA, null, null, true, false,
true);
+      assertNotNull(server.getAddressInfo(addressA));
+      cf.createSession().createConsumer(queueA).close();
+      assertNotNull(server.getAddressInfo(addressA));
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6cb6e95c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteQueueTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteQueueTest.java
new file mode 100644
index 0000000..ad68c58
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteQueueTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.client;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.RoutingType;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AutoDeleteQueueTest extends ActiveMQTestBase {
+
+   public final SimpleString addressA = new SimpleString("addressA");
+   public final SimpleString queueA = new SimpleString("queueA");
+
+   private ServerLocator locator;
+   private ActiveMQServer server;
+   private ClientSessionFactory cf;
+
+   @Override
+   @Before
+   public void setUp() throws Exception {
+      super.setUp();
+      locator = createInVMNonHALocator();
+      server = createServer(false);
+
+      server.start();
+      cf = createSessionFactory(locator);
+   }
+
+   @Test
+   public void testAutoDeleteAutoCreatedQueue() throws Exception {
+      // auto-delete-queues defaults to true
+      server.createQueue(addressA, RoutingType.ANYCAST, queueA, null, null, true, false,
true);
+      assertNotNull(server.locateQueue(queueA));
+      cf.createSession().createConsumer(queueA).close();
+      assertNull(server.locateQueue(queueA));
+   }
+
+   @Test
+   public void testNegativeAutoDeleteAutoCreatedQueue() throws Exception {
+      server.getAddressSettingsRepository().addMatch(addressA.toString(), new AddressSettings().setAutoDeleteQueues(false));
+      server.createQueue(addressA, RoutingType.ANYCAST, queueA, null, null, true, false,
true);
+      assertNotNull(server.locateQueue(queueA));
+      cf.createSession().createConsumer(queueA).close();
+      assertNotNull(server.locateQueue(queueA));
+   }
+}


Mime
View raw message