[sling-org-apache-sling-jcr-jackrabbit-usermanager] branch master updated: Only one method invocation is expected when testing checked exceptions

[enorman]

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

enorman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git


The following commit(s) were added to refs/heads/master by this push:
     new db31f9e  Only one method invocation is expected when testing checked 
exceptions
db31f9e is described below

commit db31f9e74b8940d1b2ca27013d204b45f5a028da
Author: Eric Norman <enor...@apache.org>
AuthorDate: Mon Oct 12 13:22:13 2020 -0700

    Only one method invocation is expected when testing checked exceptions
---
 .../jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
 
b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
index 782d683..6aa95bf 100644
--- 
a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
+++ 
b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
@@ -52,6 +52,7 @@ import 
org.apache.sling.jcr.jackrabbit.accessmanager.DeleteAces;
 import org.apache.sling.jcr.jackrabbit.accessmanager.ModifyAce;
 import org.apache.sling.jcr.jackrabbit.usermanager.it.UserManagerTestSupport;
 import org.apache.sling.servlets.post.Modification;
+import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -296,9 +297,11 @@ public class ChangeUserPasswordIT extends 
UserManagerTestSupport {
                     privilegesInfo.canChangePassword(user1Session, 
user1.getID()));
 
             // no oldPassword submitted
+            @NotNull
+                       String user1Id = user1.getID();
             try {
-                changeUserPassword.changePassword(user1Session,
-                        user1.getID(),
+                               changeUserPassword.changePassword(user1Session,
+                        user1Id,
                         null,
                         "testPwdChanged",
                         "testPwdChanged",
@@ -312,7 +315,7 @@ public class ChangeUserPasswordIT extends 
UserManagerTestSupport {
             // empty oldPassword submitted
             try {
                 changeUserPassword.changePassword(user1Session,
-                        user1.getID(),
+                        user1Id,
                         "",
                         "testPwdChanged2",
                         "testPwdChanged2",