https://issues.apache.org/jira/browse/AMQ-5697 - fix regression in SimpleAuthorizationMapTest
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e16d0543 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e16d0543 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e16d0543 Branch: refs/heads/master Commit: e16d054362b51786576b71d01031aec1550653db Parents: 1d71cb7 Author: gtully <[email protected]> Authored: Fri Apr 3 15:13:44 2015 +0100 Committer: gtully <[email protected]> Committed: Fri Apr 3 15:13:44 2015 +0100 ---------------------------------------------------------------------- .../apache/activemq/security/AuthorizationMapTest.java | 11 ++++++++--- .../activemq/security/SimpleAuthorizationMapTest.java | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/e16d0543/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java index dc4192f..59c9495 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java @@ -45,9 +45,8 @@ public class AuthorizationMapTest extends TestCase { } public void testComposite() { - DefaultAuthorizationMap map = (DefaultAuthorizationMap)createAuthorizationMap(); - map.put(new ActiveMQQueue("QUEUEA"), createEntry("QUEUEA", "users", "users", "users")); - map.put(new ActiveMQQueue("QUEUEB"), createEntry("QUEUEB", "users", "users", "users")); + AuthorizationMap map = createAuthorizationMap(); + addABEntry(map); Set<?> readACLs = map.getReadACLs(new ActiveMQQueue("USERS.FOO.BAR,DENIED")); assertEquals("set size: " + readACLs, 1, readACLs.size()); @@ -62,6 +61,12 @@ public class AuthorizationMapTest extends TestCase { assertTrue("Contains users group", readACLs.contains(USERS)); } + protected void addABEntry(AuthorizationMap map) { + DefaultAuthorizationMap defaultMap = (DefaultAuthorizationMap) map; + defaultMap.put(new ActiveMQQueue("QUEUEA"), createEntry("QUEUEA", "users", "users", "users")); + defaultMap.put(new ActiveMQQueue("QUEUEB"), createEntry("QUEUEB", "users", "users", "users")); + } + public void testAuthorizationMapWithTempDest() { AuthorizationMap map = createAuthorizationMapWithTempDest(); http://git-wip-us.apache.org/repos/asf/activemq/blob/e16d0543/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthorizationMapTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthorizationMapTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthorizationMapTest.java index f86e0fc..4300600 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthorizationMapTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthorizationMapTest.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.security; +import org.apache.activemq.command.ActiveMQQueue; /** * * @@ -25,4 +26,11 @@ public class SimpleAuthorizationMapTest extends AuthorizationMapTest { protected AuthorizationMap createAuthorizationMap() { return SimpleSecurityBrokerSystemTest.createAuthorizationMap(); } + + protected void addABEntry(AuthorizationMap map) { + SimpleAuthorizationMap simpleMap = (SimpleAuthorizationMap) map; + simpleMap.getReadACLs().put(new ActiveMQQueue("QUEUEA"), USERS); + simpleMap.getReadACLs().put(new ActiveMQQueue("QUEUEB"), USERS); + } + }
