ARTEMIS-584 fix test
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4f36033c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4f36033c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4f36033c Branch: refs/heads/master Commit: 4f36033c289ca79fb46798cecb8ddfe5087205ae Parents: 7b50f6a Author: jbertram <[email protected]> Authored: Wed Jul 6 16:34:53 2016 -0500 Committer: Clebert Suconic <[email protected]> Committed: Wed Jul 6 19:11:13 2016 -0400 ---------------------------------------------------------------------- .../core/server/impl/ActiveMQServerImpl.java | 2 +- .../integration/server/ResourceLimitTest.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4f36033c/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 e67cd06..fa9983f 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 @@ -1215,7 +1215,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { return; } else if (limits.getMaxQueues() == 0 || getQueueCountForUser(username) >= limits.getMaxQueues()) { - throw ActiveMQMessageBundle.BUNDLE.queueLimitReached(username, limits.getMaxConnections()); + throw ActiveMQMessageBundle.BUNDLE.queueLimitReached(username, limits.getMaxQueues()); } } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4f36033c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java index 9d4edce..2a40821 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java @@ -16,6 +16,9 @@ */ package org.apache.activemq.artemis.tests.integration.server; +import java.util.HashSet; +import java.util.Set; + import org.apache.activemq.artemis.api.core.ActiveMQSessionCreationException; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; @@ -23,9 +26,11 @@ import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings; +import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -46,10 +51,21 @@ public class ResourceLimitTest extends ActiveMQTestBase { resourceLimitSettings.setMaxConnections(1); resourceLimitSettings.setMaxQueues(1); - Configuration configuration = createBasicConfig().addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)).addResourceLimitSettings(resourceLimitSettings); + Configuration configuration = createBasicConfig() + .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)) + .addResourceLimitSettings(resourceLimitSettings) + .setSecurityEnabled(true); server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); server.start(); + + ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager(); + securityManager.getConfiguration().addUser("myUser", "password"); + securityManager.getConfiguration().addRole("myUser", "arole"); + Role role = new Role("arole", false, false, false, false, true, true, false); + Set<Role> roles = new HashSet<>(); + roles.add(role); + server.getSecurityRepository().addMatch("#", roles); } @Test
