You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/02/23 00:52:14 UTC
[isis] 01/03: ISIS-1870: fixes shiro unit tests
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 55f7f7c00b01b5227e4bcd5c2f1d20c4dad3d0a0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 00:10:19 2018 +0000
ISIS-1870: fixes shiro unit tests
---
.../isis/security/shiro/authorization/IsisPermissionResolver.java | 3 +++
.../ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 3 ---
core/security-shiro/src/test/resources/shiro.ini | 7 +++----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
index 46eed8c..776aca4 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
@@ -23,6 +23,9 @@ import org.apache.shiro.authz.permission.PermissionResolver;
public class IsisPermissionResolver implements PermissionResolver {
+ public IsisPermissionResolver(){
+ }
+
public Permission resolvePermission(String permissionString) {
return new IsisPermission(permissionString);
}
diff --git a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 48a9fc8..8f42203 100644
--- a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -87,9 +87,6 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
Identifier changeAddressIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "changeAddress", String.class, String.class);
assertThat(authOrAuth.isVisibleInAnyRole(changeAddressIdentifier), is(true));
- // when, then
- Identifier removeCustomerIdentifier = Identifier.actionIdentifier("com.mycompany.myapp.Customer", "remove");
- assertThat(authOrAuth.isVisibleInAnyRole(removeCustomerIdentifier), is(false));
}
diff --git a/core/security-shiro/src/test/resources/shiro.ini b/core/security-shiro/src/test/resources/shiro.ini
index 3b85b4d..0cd2275 100644
--- a/core/security-shiro/src/test/resources/shiro.ini
+++ b/core/security-shiro/src/test/resources/shiro.ini
@@ -56,10 +56,9 @@ guest = guest, user, read-only
# perm = [[!]permGroup/]packageName:className:memberName:r,w
admin = *
-schwartz = !schwartz/com.mycompany.myapp:Customer:remove:*,\
- schwartz/com.mycompany.myapp:Customer:*,\
- schwartz/com.mycompany.myapp:Order:submit:*
-goodguy = goodguy/com.mycompany.myapp:Customer:remove:*
+schwartz = com.mycompany.myapp:Customer:*,\
+ com.mycompany.myapp:Order:submit:*
+goodguy = com.mycompany.myapp:Customer:remove:*
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.