[isis] branch v2 updated: ISIS-1976: fixing shiro tests

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new c795ca6  ISIS-1976: fixing shiro tests
c795ca6 is described below

commit c795ca6cdc8170abef691557faacba18c5717269
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 18 06:13:45 2018 +0200

    ISIS-1976: fixing shiro tests
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
 .../src/main/java/org/apache/isis/security/shiro/util/Util.java  | 2 +-
 .../permrolemapper/PermissionToRoleMapperFromStringTest.java     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/util/Util.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/util/Util.java
index 1392989..dd5ffac 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/util/Util.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/util/Util.java
@@ -41,7 +41,7 @@ public class Util {
                 return;
             }
             final String role = roleAndPerms.get(0).trim();
-            final String permStr = roleAndPerms.get(0).trim();
+            final String permStr = roleAndPerms.get(1).trim();
             
             final Set<String> perms = _Strings.splitThenStream(permStr, ",")
                     .map(String::trim)
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
index 42ebdc6..448bddd 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
@@ -20,13 +20,12 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.junit.Test;
 
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.collections._Sets;
 
 public class PermissionToRoleMapperFromStringTest {
 
@@ -37,9 +36,9 @@ public class PermissionToRoleMapperFromStringTest {
                 + "role2 = fiz:x,bip:bop:* ;"
                 + "role3 = *").getPermissionsByRole();
         
-        assertThat(permissionsByRole.get("role1"), is(equalTo((List<String>)_Lists.of("foo","bar"))));
-        assertThat(permissionsByRole.get("role2"), is(equalTo((List<String>)_Lists.of("fiz:x","bip:bop:*"))));
-        assertThat(permissionsByRole.get("role3"), is(equalTo((List<String>)_Lists.of("*"))));
+        assertThat(permissionsByRole.get("role1"), is(equalTo((Set<String>)_Sets.of("foo","bar"))));
+        assertThat(permissionsByRole.get("role2"), is(equalTo((Set<String>)_Sets.of("fiz:x","bip:bop:*"))));
+        assertThat(permissionsByRole.get("role3"), is(equalTo((Set<String>)_Sets.of("*"))));
         assertThat(permissionsByRole.size(), is(3));
     }