From be4b7a5576b674f3d386f8d8fdf2a5a324d9dd66 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 7 Jan 2025 14:48:19 -0500 Subject: [PATCH] Fix shiro test Signed-off-by: Craig Perkins --- .../identity/shiro/ShiroIdentityPluginTests.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroIdentityPluginTests.java b/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroIdentityPluginTests.java index a15538e48bd66..2b40fda145aa7 100644 --- a/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroIdentityPluginTests.java +++ b/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroIdentityPluginTests.java @@ -9,11 +9,11 @@ package org.opensearch.identity.shiro; import org.opensearch.OpenSearchException; +import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.identity.IdentityService; import org.opensearch.plugins.IdentityPlugin; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.threadpool.ThreadPool; import java.util.List; @@ -28,7 +28,7 @@ public class ShiroIdentityPluginTests extends OpenSearchTestCase { public void testSingleIdentityPluginSucceeds() { IdentityPlugin identityPlugin1 = new ShiroIdentityPlugin(Settings.EMPTY); List pluginList1 = List.of(identityPlugin1); - IdentityService identityService1 = new IdentityService(Settings.EMPTY, mock(ThreadPool.class), pluginList1); + IdentityService identityService1 = new IdentityService(Settings.EMPTY, mock(Client.class), pluginList1); assertThat(identityService1.getTokenManager(), is(instanceOf(ShiroTokenManager.class))); } @@ -37,10 +37,7 @@ public void testMultipleIdentityPluginsFail() { IdentityPlugin identityPlugin2 = new ShiroIdentityPlugin(Settings.EMPTY); IdentityPlugin identityPlugin3 = new ShiroIdentityPlugin(Settings.EMPTY); List pluginList = List.of(identityPlugin1, identityPlugin2, identityPlugin3); - Exception ex = assertThrows( - OpenSearchException.class, - () -> new IdentityService(Settings.EMPTY, mock(ThreadPool.class), pluginList) - ); + Exception ex = assertThrows(OpenSearchException.class, () -> new IdentityService(Settings.EMPTY, mock(Client.class), pluginList)); assert (ex.getMessage().contains("Multiple identity plugins are not supported,")); }