OAK-9246 : Avoid hardcoding stats classes in SecurityProviderRegistration (typo in javadoc LoginModuleMonitor, mockito errors in LoginModuleMonitorTest with java8)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1885265 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
index e38dce3..4c53d88 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitor.java
@@ -34,7 +34,7 @@
};
/**
- * 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.
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
index 177d58c..5ccd35d 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginModuleMonitorTest.java
@@ -22,24 +22,23 @@
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 @@
assertTrue(noop.getMonitorProperties().isEmpty());
assertTrue(monitor.getMonitorProperties().isEmpty());
}
+
+ public static class TestLoginModuleMonitor implements LoginModuleMonitor {
+
+ @Override
+ public void loginError() {
+ //nop
+ }
+ }
}
