svn commit: r1885265 - in /jackrabbit/oak/trunk/oak-security-spi/src: main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java

[angela]

Author: angela
Date: Fri Jan  8 09:11:18 2021
New Revision: 1885265

URL: http://svn.apache.org/viewvc?rev=1885265&view=rev
Log:
OAK-9246 : Avoid hardcoding stats classes in SecurityProviderRegistration (typo 
in javadoc LoginModuleMonitor, mockito errors in LoginModuleMonitorTest with 
java8)

Modified:
    
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
    
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java

Modified: 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java?rev=1885265&r1=1885264&r2=1885265&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
 Fri Jan  8 09:11:18 2021
@@ -34,7 +34,7 @@ public interface LoginModuleMonitor exte
     };
 
     /**
-     * Event to be called in the case there is an erorr in the login chain. 
This
+     * Event to be called in the case there is an error in the login chain. 
This
      * is not covering failed logins, but actual operational errors that
      * probably need to be investigated. Any triggered even should have a
      * corresponding error logged to make this investigation possible.

Modified: 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java?rev=1885265&r1=1885264&r2=1885265&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
 Fri Jan  8 09:11:18 2021
@@ -22,24 +22,23 @@ import org.mockito.Answers;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.withSettings;
 
 public class LoginModuleMonitorTest {
 
-    private final LoginModuleMonitor noop = spy(LoginModuleMonitor.NOOP);
-    private final LoginModuleMonitor monitor = mock(LoginModuleMonitor.class, 
withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS));
+    private final LoginModuleMonitor noop = LoginModuleMonitor.NOOP;
+    private final LoginModuleMonitor monitor = 
mock(TestLoginModuleMonitor.class, 
withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS));
 
     @Test
     public void testLoginError() {
         noop.loginError();
         verifyNoInteractions(monitor);
-        reset(noop, monitor);
 
         monitor.loginError();
-        verifyNoInteractions(noop);
+        verify(monitor, times(1)).loginError();
     }
 
     @Test
@@ -53,4 +52,12 @@ public class LoginModuleMonitorTest {
         assertTrue(noop.getMonitorProperties().isEmpty());
         assertTrue(monitor.getMonitorProperties().isEmpty());
     }
+
+    public static class TestLoginModuleMonitor implements LoginModuleMonitor {
+
+        @Override
+        public void loginError() {
+            //nop
+        }
+    }
 }