[isis] branch master updated: ISIS-1870 proper test tearDown, tests still fail

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b0858df  ISIS-1870 proper test tearDown, tests still fail
b0858df is described below

commit b0858dfd3fae294a9664ea9b9e06b9fca87a7188
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Feb 22 20:08:30 2018 +0100

    ISIS-1870 proper test tearDown, tests still fail
---
 .../shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java         | 3 ++-
 .../shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
 
b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 924f556..a598a50 100644
--- 
a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ 
b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -36,6 +36,7 @@ import org.apache.shiro.config.IniSecurityManagerFactory;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.util.Factory;
+import org.apache.shiro.util.ThreadContext;
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
 import org.junit.After;
@@ -67,7 +68,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
 
     @After
     public void tearDown() throws Exception {
-        Subject subject = SecurityUtils.getSubject();
+        Subject subject = ThreadContext.getSubject();
         if(subject != null) {
             subject.logout();
         }
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 01af4a8..48a9fc8 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
@@ -23,6 +23,7 @@ import org.apache.shiro.config.IniSecurityManagerFactory;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.util.Factory;
+import org.apache.shiro.util.ThreadContext;
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
 import org.junit.After;
@@ -65,7 +66,7 @@ public class 
ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
 
     @After
     public void tearDown() throws Exception {
-        Subject subject = SecurityUtils.getSubject();
+        Subject subject = ThreadContext.getSubject();
         if(subject != null) {
             subject.logout();
         }

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.