Fix tests

Author: n1v0lg

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticatorChainTests.java

@@ -67,7 +67,7 @@ public class AuthenticatorChainTests extends ESTestCase {
     private ServiceAccountAuthenticator serviceAccountAuthenticator;
     private OAuth2TokenAuthenticator oAuth2TokenAuthenticator;
     private ApiKeyAuthenticator apiKeyAuthenticator;
-    private PluggableApiKeyAuthenticator customApiKeyAuthenticatorWrapper;
+    private PluggableApiKeyAuthenticator pluggableApiKeyAuthenticator;
     private RealmsAuthenticator realmsAuthenticator;
     private Authentication authentication;
     private User fallbackUser;
@@ -92,7 +92,7 @@ public void init() {
         oAuth2TokenAuthenticator = mock(OAuth2TokenAuthenticator.class);
         apiKeyAuthenticator = mock(ApiKeyAuthenticator.class);
         realmsAuthenticator = mock(RealmsAuthenticator.class);
-        customApiKeyAuthenticatorWrapper = mock(PluggableApiKeyAuthenticator.class);
+        pluggableApiKeyAuthenticator = mock(PluggableApiKeyAuthenticator.class);
         when(realms.getActiveRealms()).thenReturn(List.of(mock(Realm.class)));
         when(realms.getUnlicensedRealms()).thenReturn(List.of());
         final User user = new User(randomAlphaOfLength(8));
@@ -105,7 +105,7 @@ public void init() {
             authenticationContextSerializer,
             serviceAccountAuthenticator,
             oAuth2TokenAuthenticator,
-            customApiKeyAuthenticatorWrapper,
+            pluggableApiKeyAuthenticator,
             apiKeyAuthenticator,
             realmsAuthenticator
         );
@@ -220,7 +220,13 @@ public void testAuthenticateWithApiKey() throws IOException {
                 new ApiKeyCredentials(randomAlphaOfLength(20), apiKeySecret, randomFrom(ApiKey.Type.values()))
             );
             doCallRealMethod().when(serviceAccountAuthenticator).authenticate(eq(context), anyActionListener());
-            doCallRealMethod().when(customApiKeyAuthenticatorWrapper).authenticate(eq(context), anyActionListener());
+            doAnswer(invocationOnMock -> {
+                @SuppressWarnings("unchecked")
+                final ActionListener<AuthenticationResult<Authentication>> listener = (ActionListener<
+                    AuthenticationResult<Authentication>>) invocationOnMock.getArguments()[1];
+                listener.onResponse(AuthenticationResult.notHandled());
+                return null;
+            }).when(pluggableApiKeyAuthenticator).authenticate(eq(context), any());
             doCallRealMethod().when(oAuth2TokenAuthenticator).authenticate(eq(context), anyActionListener());
         }
         doAnswer(invocationOnMock -> {
@@ -263,7 +269,13 @@ public void testAuthenticateWithRealms() throws IOException {
             doCallRealMethod().when(serviceAccountAuthenticator).authenticate(eq(context), anyActionListener());
             doCallRealMethod().when(oAuth2TokenAuthenticator).authenticate(eq(context), anyActionListener());
             doCallRealMethod().when(apiKeyAuthenticator).authenticate(eq(context), anyActionListener());
-            doCallRealMethod().when(customApiKeyAuthenticatorWrapper).authenticate(eq(context), anyActionListener());
+            doAnswer(invocationOnMock -> {
+                @SuppressWarnings("unchecked")
+                final ActionListener<AuthenticationResult<Authentication>> listener = (ActionListener<
+                    AuthenticationResult<Authentication>>) invocationOnMock.getArguments()[1];
+                listener.onResponse(AuthenticationResult.notHandled());
+                return null;
+            }).when(pluggableApiKeyAuthenticator).authenticate(eq(context), any());
         }
         doAnswer(invocationOnMock -> {
             @SuppressWarnings("unchecked")
@@ -326,7 +338,14 @@ public void testContextWithDirectWrongTokenFailsAuthn() {
         doCallRealMethod().when(serviceAccountAuthenticator).authenticate(eq(context), anyActionListener());
         doCallRealMethod().when(oAuth2TokenAuthenticator).authenticate(eq(context), anyActionListener());
         doCallRealMethod().when(apiKeyAuthenticator).authenticate(eq(context), anyActionListener());
-        doCallRealMethod().when(customApiKeyAuthenticatorWrapper).authenticate(eq(context), anyActionListener());
+        doAnswer(invocationOnMock -> {
+            @SuppressWarnings("unchecked")
+            final ActionListener<AuthenticationResult<Authentication>> listener = (ActionListener<
+                AuthenticationResult<Authentication>>) invocationOnMock.getArguments()[1];
+            listener.onResponse(AuthenticationResult.notHandled());
+            return null;
+        }).when(pluggableApiKeyAuthenticator).authenticate(eq(context), any());
+
         // 1. realms do not consume the token
         doAnswer(invocationOnMock -> {
             @SuppressWarnings("unchecked")