This is an automated email from the ASF dual-hosted git repository. bdemers pushed a commit to branch 1-9-build-fix in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 51f00239c8cec217c64db27b91386ba06e94e0af Author: Brian Demers <[email protected]> AuthorDate: Wed Jun 15 17:06:23 2022 -0400 Porting mockito build changes back to 1.9 branch for failing AuthorizationFilterTest --- pom.xml | 8 +++++ .../web/filter/authz/AuthorizationFilterTest.java | 38 ++++++++++------------ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 150ec49e..26ced648 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,7 @@ <!-- Test 3rd-party dependencies: --> <easymock.version>4.1</easymock.version> + <mockito.version>3.12.4</mockito.version> <gmaven.version>1.13.1</gmaven.version> <groovy.version>2.5.14</groovy.version> <junit.version>4.12</junit.version> @@ -666,6 +667,12 @@ <version>${easymock.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> <!-- Writing tests in groovy is fast!: --> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -1229,6 +1236,7 @@ <link>https://docs.spring.io/spring/docs/2.5.x/javadoc-api/</link> <link>https://junit.org/junit4/javadoc/4.12/</link> <link>http://easymock.org/api/easymock/2.4</link> + <link>https://javadoc.io/doc/org.mockito/mockito-core/${mockito.version}/org/mockito/Mockito.html</link> <link>https://www.quartz-scheduler.org/api/1.8.6/</link> </links> <!-- Don't include the sample apps - they're not part of Shiro's API: --> diff --git a/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java b/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java index dba7cb53..5278975e 100644 --- a/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java +++ b/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java @@ -29,7 +29,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Test cases for the {@link AuthorizationFilter} class. @@ -43,22 +46,20 @@ public class AuthorizationFilterTest extends SecurityManagerTestSupport { //log in the user using the account provided by the superclass for tests: SecurityUtils.getSubject().login(new UsernamePasswordToken("test", "test")); - + AuthorizationFilter filter = new AuthorizationFilter() { @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) - throws Exception { + protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { return false; //for this test case } }; - HttpServletRequest request = createNiceMock(HttpServletRequest.class); - HttpServletResponse response = createNiceMock(HttpServletResponse.class); + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED); - replay(response); + // response.sendError(HttpServletResponse.SC_UNAUTHORIZED); filter.onAccessDenied(request, response); - verify(response); + verify(response).sendError(HttpServletResponse.SC_UNAUTHORIZED); } @Test @@ -73,27 +74,22 @@ public class AuthorizationFilterTest extends SecurityManagerTestSupport { AuthorizationFilter filter = new AuthorizationFilter() { @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) - throws Exception { + protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { return false; //for this test case } }; filter.setUnauthorizedUrl(unauthorizedUrl); - HttpServletRequest request = createNiceMock(HttpServletRequest.class); - HttpServletResponse response = createNiceMock(HttpServletResponse.class); - - expect(request.getContextPath()).andReturn("/").anyTimes(); + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); String encoded = "/" + unauthorizedUrl; - expect(response.encodeRedirectURL(unauthorizedUrl)).andReturn(encoded); + when(response.encodeRedirectURL(unauthorizedUrl)).thenReturn(encoded); response.sendRedirect(encoded); - replay(request); - replay(response); filter.onAccessDenied(request, response); - verify(request); - verify(response); + verify(response, atLeastOnce()).sendRedirect(encoded); + verify(response).encodeRedirectURL(unauthorizedUrl); } -} +} \ No newline at end of file
