shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [1/3] shiro git commit: SHIRO-412: fixed static method import order (PowerMock replay methods were being trumped by EasyMock's)
Date Wed, 13 Jul 2016 20:07:58 GMT
Repository: shiro
Updated Branches:
  refs/heads/1.3.x dbc0bb122 -> c8bbb0912


SHIRO-412: fixed static method import order (PowerMock replay methods were being trumped by
EasyMock's)

git-svn-id: https://svn.apache.org/repos/asf/shiro/trunk@1442317 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/c8bbb091
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/c8bbb091
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/c8bbb091

Branch: refs/heads/1.3.x
Commit: c8bbb09122e1332337804ab4dd698bf7acb4f55e
Parents: 0b505c2
Author: Les Hazlewood <lhazlewood@apache.org>
Authored: Mon Feb 4 19:47:05 2013 +0000
Committer: Brian Demers <bdemers@apache.org>
Committed: Wed Jul 13 13:23:07 2016 -0400

----------------------------------------------------------------------
 .../apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/c8bbb091/support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
----------------------------------------------------------------------
diff --git a/support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
b/support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
index d22eacb..49b8e4a 100644
--- a/support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
+++ b/support/hazelcast/src/test/groovy/org/apache/shiro/hazelcast/cache/HazelcastCacheManagerTest.groovy
@@ -29,7 +29,8 @@ import org.junit.runner.RunWith
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
-import static org.easymock.EasyMock.*
+import static org.easymock.EasyMock.expect
+import static org.easymock.EasyMock.same
 import static org.junit.Assert.*
 import static org.powermock.api.easymock.PowerMock.*
 


Mime
View raw message