This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/3.x by this push:
new 0ce506f8d test: migrate from EasyMock to Mockito in
PathMatchingFilterProviderTest and WebGuiceEnvironmentTest due to issues with
bytebuddy + JDK 26
0ce506f8d is described below
commit 0ce506f8d99b571f8f1c9b04aa6e0afb4cd45b29
Author: lprimak <[email protected]>
AuthorDate: Fri Jun 12 21:07:48 2026 -0500
test: migrate from EasyMock to Mockito in PathMatchingFilterProviderTest
and WebGuiceEnvironmentTest due to issues with bytebuddy + JDK 26
---
.../guice/web/PathMatchingFilterProviderTest.java | 18 ++++--------
.../shiro/guice/web/WebGuiceEnvironmentTest.java | 32 ++++++++--------------
2 files changed, 18 insertions(+), 32 deletions(-)
diff --git
a/support/guice/src/test/java/org/apache/shiro/guice/web/PathMatchingFilterProviderTest.java
b/support/guice/src/test/java/org/apache/shiro/guice/web/PathMatchingFilterProviderTest.java
index df3798c26..d13ead903 100644
---
a/support/guice/src/test/java/org/apache/shiro/guice/web/PathMatchingFilterProviderTest.java
+++
b/support/guice/src/test/java/org/apache/shiro/guice/web/PathMatchingFilterProviderTest.java
@@ -25,22 +25,15 @@ import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
class PathMatchingFilterProviderTest {
@Test
void testPostProcess() {
- PathMatchingFilter filter = createMock(PathMatchingFilter.class);
+ PathMatchingFilter filter = mock(PathMatchingFilter.class);
- expect(filter.processPathConfig("/1", "first")).andReturn(filter);
- expect(filter.processPathConfig("/2", "second")).andReturn(filter);
-
- replay(filter);
-
- Map<String, String> pathConfigMap = new HashMap<String, String>();
+ Map<String, String> pathConfigMap = new HashMap<>();
pathConfigMap.put("/1", "first");
pathConfigMap.put("/2", "second");
@@ -49,6 +42,7 @@ class PathMatchingFilterProviderTest {
underTest.postProcess(filter);
- verify(filter);
+ verify(filter).processPathConfig("/1", "first");
+ verify(filter).processPathConfig("/2", "second");
}
}
diff --git
a/support/guice/src/test/java/org/apache/shiro/guice/web/WebGuiceEnvironmentTest.java
b/support/guice/src/test/java/org/apache/shiro/guice/web/WebGuiceEnvironmentTest.java
index b2a9587af..3b1905f79 100644
---
a/support/guice/src/test/java/org/apache/shiro/guice/web/WebGuiceEnvironmentTest.java
+++
b/support/guice/src/test/java/org/apache/shiro/guice/web/WebGuiceEnvironmentTest.java
@@ -23,27 +23,23 @@ import org.apache.shiro.web.config.ShiroFilterConfiguration;
import org.apache.shiro.web.env.EnvironmentLoaderListener;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
import org.apache.shiro.web.mgt.WebSecurityManager;
-import org.easymock.Capture;
import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
import jakarta.servlet.ServletContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
-import static org.easymock.EasyMock.and;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
public class WebGuiceEnvironmentTest {
@Test
void ensureInjectable() {
try {
- InjectionPoint ip =
InjectionPoint.forConstructorOf(WebGuiceEnvironment.class);
+ InjectionPoint.forConstructorOf(WebGuiceEnvironment.class);
} catch (Exception e) {
fail("Could not create constructor injection point.");
}
@@ -51,16 +47,12 @@ public class WebGuiceEnvironmentTest {
@Test
void testConstructor() {
- WebSecurityManager securityManager =
createMock(WebSecurityManager.class);
- FilterChainResolver filterChainResolver =
createMock(FilterChainResolver.class);
- ServletContext servletContext = createMock(ServletContext.class);
- ShiroFilterConfiguration filterConfiguration =
createMock(ShiroFilterConfiguration.class);
+ WebSecurityManager securityManager = mock(WebSecurityManager.class);
+ FilterChainResolver filterChainResolver =
mock(FilterChainResolver.class);
+ ServletContext servletContext = mock(ServletContext.class);
+ ShiroFilterConfiguration filterConfiguration =
mock(ShiroFilterConfiguration.class);
- Capture<WebGuiceEnvironment> capture = Capture.newInstance();
-
servletContext.setAttribute(eq(EnvironmentLoaderListener.ENVIRONMENT_ATTRIBUTE_KEY),
- and(anyObject(WebGuiceEnvironment.class), capture(capture)));
-
- replay(servletContext, securityManager, filterChainResolver);
+ ArgumentCaptor<WebGuiceEnvironment> capture =
ArgumentCaptor.forClass(WebGuiceEnvironment.class);
WebGuiceEnvironment underTest =
new WebGuiceEnvironment(filterChainResolver, servletContext,
securityManager, filterConfiguration);
@@ -70,8 +62,8 @@ public class WebGuiceEnvironmentTest {
assertThat(underTest.getWebSecurityManager()).isSameAs(securityManager);
assertThat(underTest.getServletContext()).isSameAs(servletContext);
- assertThat(capture.getValue()).isSameAs(underTest);
+
verify(servletContext).setAttribute(eq(EnvironmentLoaderListener.ENVIRONMENT_ATTRIBUTE_KEY),
capture.capture());
- verify(servletContext);
+ assertThat(capture.getValue()).isSameAs(underTest);
}
}
