You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by GitBox <gi...@apache.org> on 2021/01/22 12:46:01 UTC
[GitHub] [shiro] bmarwell opened a new pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
bmarwell opened a new pull request #282:
URL: https://github.com/apache/shiro/pull/282
https://issues.apache.org/jira/browse/SHIRO-811
---
Following this checklist to help us incorporate your contribution quickly and easily:
- [X] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SHIRO) filed
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
- [X] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[SHIRO-XXX] - Fixes bug in SessionManager`,
where you replace `SHIRO-XXX` with the appropriate JIRA issue. Best practice
is to use the JIRA issue title in the pull request title and in the first line of the commit message.
- [X] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [X] Run `mvn clean install apache-rat:check` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
- [X] If you have a group of commits related to the same change, please squash your commits into one and force push your branch using `git rebase -i`.
Trivial changes like typos do not require a JIRA issue (javadoc, comments...).
In this case, just format the pull request title like `(DOC) - Add javadoc in SessionManager`.
If this is your first contribution, you have to read the [Contribution Guidelines](https://github.com/apache/shiro/blob/master/CONTRIBUTING.md)
If your pull request is about ~20 lines of code you don't need to sign an [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf)
if you are unsure please ask on the developers list.
To make clear that you license your contribution under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
you have to acknowledge this by using the following check-box.
- [X] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
- [X] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bmarwell commented on pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bmarwell commented on pull request #282:
URL: https://github.com/apache/shiro/pull/282#issuecomment-767076698
Hi @bdemers,
feel free to re-review. I converted some more tests, and now the "flaky test" seems to have gone for good.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bmarwell commented on pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bmarwell commented on pull request #282:
URL: https://github.com/apache/shiro/pull/282#issuecomment-766909934
Hi Brian,
I will not merge this PR as long as there are those toggling test results: https://ci-builds.apache.org/job/Shiro/job/Shiro-all/view/change-requests/job/PR-282/
I just need to have a non-draft PR so I can see the Jenkins output.
By the way, the test never failed on my machine. I cannot even reproduce it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] asfgit merged pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
asfgit merged pull request #282:
URL: https://github.com/apache/shiro/pull/282
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bmarwell commented on pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bmarwell commented on pull request #282:
URL: https://github.com/apache/shiro/pull/282#issuecomment-765515790
Huh. Maybe there is still some Powermock stuff going around in the background. Wouldn't be the first time we had issues with it. I'll look for other occurrences.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bdemers commented on a change in pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bdemers commented on a change in pull request #282:
URL: https://github.com/apache/shiro/pull/282#discussion_r563786666
##########
File path: web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java
##########
@@ -158,80 +147,72 @@ public void httpMethodDoesNotRequireAuthentication() throws Exception {
public void httpMethodRequiresAuthentication() throws Exception {
testFilter = new BasicHttpAuthenticationFilter();
- HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getHeader("Authorization")).andReturn(createAuthorizationHeader("pedro", ""));
- expect(request.getRemoteHost()).andReturn("localhost");
- expect(request.getMethod()).andReturn("POST");
- replay(request);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ when(request.getHeader("Authorization")).then(args -> createAuthorizationHeader("pedro", ""));
+ when(request.getRemoteHost()).then(args -> "localhost");
+ when(request.getMethod()).then(args -> "POST");
- HttpServletResponse response = createMock(HttpServletResponse.class);
- replay(response);
+ HttpServletResponse response = mock(HttpServletResponse.class);
boolean accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "POST", "PUT", "DELETE" });
- assertTrue("Access allowed for POST", !accessAllowed);
+ assertFalse("Access allowed for POST", accessAllowed);
}
@Test
public void httpMethodsAreCaseInsensitive() throws Exception {
testFilter = new BasicHttpAuthenticationFilter();
- HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getMethod()).andReturn("GET");
- expect(request.getMethod()).andReturn("post");
- expect(request.getHeader("Authorization")).andReturn(createAuthorizationHeader("pedro", "")).anyTimes();
- expect(request.getRemoteHost()).andReturn("localhost").anyTimes();
- replay(request);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ when(request.getMethod()).then(args -> "GET");
+ when(request.getHeader("Authorization")).then(args -> createAuthorizationHeader("pedro", ""));
+ when(request.getRemoteHost()).then(args -> "localhost");
- HttpServletResponse response = createMock(HttpServletResponse.class);
- replay(response);
+ HttpServletResponse response = mock(HttpServletResponse.class);
boolean accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "POST", "put", "delete" });
assertTrue("Access not allowed for GET", accessAllowed);
-
+
+ when(request.getMethod()).then(args -> "post");
accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "post", "put", "delete" });
- assertTrue("Access allowed for POST", !accessAllowed);
+ assertFalse("Access allowed for POST", accessAllowed);
Review comment:
Good call on these!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bmarwell commented on pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bmarwell commented on pull request #282:
URL: https://github.com/apache/shiro/pull/282#issuecomment-765384133
Still fails: https://ci-builds.apache.org/job/Shiro/job/Shiro-all/view/change-requests/job/PR-282/lastCompletedBuild/testReport/
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bmarwell commented on pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bmarwell commented on pull request #282:
URL: https://github.com/apache/shiro/pull/282#issuecomment-766909934
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] asfgit merged pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
asfgit merged pull request #282:
URL: https://github.com/apache/shiro/pull/282
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shiro] bdemers commented on a change in pull request #282: [SHIRO-811] fix toggling test through Mockito conversion.
Posted by GitBox <gi...@apache.org>.
bdemers commented on a change in pull request #282:
URL: https://github.com/apache/shiro/pull/282#discussion_r563786666
##########
File path: web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java
##########
@@ -158,80 +147,72 @@ public void httpMethodDoesNotRequireAuthentication() throws Exception {
public void httpMethodRequiresAuthentication() throws Exception {
testFilter = new BasicHttpAuthenticationFilter();
- HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getHeader("Authorization")).andReturn(createAuthorizationHeader("pedro", ""));
- expect(request.getRemoteHost()).andReturn("localhost");
- expect(request.getMethod()).andReturn("POST");
- replay(request);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ when(request.getHeader("Authorization")).then(args -> createAuthorizationHeader("pedro", ""));
+ when(request.getRemoteHost()).then(args -> "localhost");
+ when(request.getMethod()).then(args -> "POST");
- HttpServletResponse response = createMock(HttpServletResponse.class);
- replay(response);
+ HttpServletResponse response = mock(HttpServletResponse.class);
boolean accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "POST", "PUT", "DELETE" });
- assertTrue("Access allowed for POST", !accessAllowed);
+ assertFalse("Access allowed for POST", accessAllowed);
}
@Test
public void httpMethodsAreCaseInsensitive() throws Exception {
testFilter = new BasicHttpAuthenticationFilter();
- HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getMethod()).andReturn("GET");
- expect(request.getMethod()).andReturn("post");
- expect(request.getHeader("Authorization")).andReturn(createAuthorizationHeader("pedro", "")).anyTimes();
- expect(request.getRemoteHost()).andReturn("localhost").anyTimes();
- replay(request);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ when(request.getMethod()).then(args -> "GET");
+ when(request.getHeader("Authorization")).then(args -> createAuthorizationHeader("pedro", ""));
+ when(request.getRemoteHost()).then(args -> "localhost");
- HttpServletResponse response = createMock(HttpServletResponse.class);
- replay(response);
+ HttpServletResponse response = mock(HttpServletResponse.class);
boolean accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "POST", "put", "delete" });
assertTrue("Access not allowed for GET", accessAllowed);
-
+
+ when(request.getMethod()).then(args -> "post");
accessAllowed = testFilter.isAccessAllowed(request, response, new String[] { "post", "put", "delete" });
- assertTrue("Access allowed for POST", !accessAllowed);
+ assertFalse("Access allowed for POST", accessAllowed);
Review comment:
Good call on these!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org