Small simplification to MockUtils (#99398)

Author: DaveCTurner

test/framework/src/main/java/org/elasticsearch/test/MockUtils.java

@@ -28,12 +28,7 @@ public class MockUtils {
      * @return A mocked TransportService instance
      */
     public static TransportService setupTransportServiceWithThreadpoolExecutor() {
-        TransportService transportService = mock(TransportService.class);
-        ThreadPool threadPool = mock(ThreadPool.class);
-
-        setMockReturns(transportService, threadPool);
-
-        return transportService;
+        return setMockReturns(mock(TransportService.class), mock(ThreadPool.class));
     }
 
     /**
@@ -44,28 +39,15 @@ public static TransportService setupTransportServiceWithThreadpoolExecutor() {
      * @return A mocked TransportService instance
      */
     public static TransportService setupTransportServiceWithThreadpoolExecutor(ThreadPool threadPool) {
-        assert mockingDetails(threadPool).isMock();
-        TransportService transportService = mock(TransportService.class);
-
-        setMockReturns(transportService, threadPool);
-
-        return transportService;
+        return setMockReturns(mock(TransportService.class), threadPool);
     }
 
-    /**
-     * Sets up the given mock TransportService so that it can answer calls to TransportService.getThreadPool().executor(String).
-     *
-     * @param transportService A mock TransportService to be set up.
-     */
-    public static void setupTransportServiceWithThreadpoolExecutor(TransportService transportService) {
+    private static TransportService setMockReturns(TransportService transportService, ThreadPool threadPool) {
+        assert mockingDetails(threadPool).isMock();
         assert mockingDetails(transportService).isMock();
-        ThreadPool threadPool = mock(ThreadPool.class);
-
-        setMockReturns(transportService, threadPool);
-    }
-
-    private static void setMockReturns(TransportService transportService, ThreadPool threadPool) {
         when(transportService.getThreadPool()).thenReturn(threadPool);
         when(threadPool.executor(anyString())).thenReturn(EsExecutors.DIRECT_EXECUTOR_SERVICE);
+        when(threadPool.generic()).thenReturn(EsExecutors.DIRECT_EXECUTOR_SERVICE);
+        return transportService;
     }
 }

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/repositories/ClearCcrRestoreSessionActionTests.java

@@ -55,10 +55,8 @@ public void testPrivilegeForActions() {
 
     public void testActionNames() {
         final ActionFilters actionFilters = mock(ActionFilters.class);
-        final TransportService transportService = mock(TransportService.class);
+        final TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor();
         final CcrRestoreSourceService ccrRestoreSourceService = mock(CcrRestoreSourceService.class);
-
-        MockUtils.setupTransportServiceWithThreadpoolExecutor(transportService);
         final var action = new ClearCcrRestoreSessionAction.TransportAction(actionFilters, transportService, ccrRestoreSourceService);
         assertThat(action.actionName, equalTo(ClearCcrRestoreSessionAction.NAME));
 
@@ -72,7 +70,7 @@ public void testActionNames() {
 
     public void testRequestedShardIdMustBeConsistentWithSessionShardId() {
         final ActionFilters actionFilters = mock(ActionFilters.class);
-        final TransportService transportService = mock(TransportService.class);
+        final TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor();
         final CcrRestoreSourceService ccrRestoreSourceService = mock(CcrRestoreSourceService.class);
 
         final ShardId expectedShardId = mock(ShardId.class);
@@ -89,7 +87,6 @@ public void testRequestedShardIdMustBeConsistentWithSessionShardId() {
             }
         }).when(ccrRestoreSourceService).ensureSessionShardIdConsistency(anyString(), any());
 
-        MockUtils.setupTransportServiceWithThreadpoolExecutor(transportService);
         final var action = new ClearCcrRestoreSessionAction.TransportAction(actionFilters, transportService, ccrRestoreSourceService);
 
         final String sessionUUID = UUIDs.randomBase64UUID();

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkActionTests.java

@@ -60,10 +60,9 @@ public void testPrivilegeForActions() {
     public void testActionNames() {
         final ActionFilters actionFilters = mock(ActionFilters.class);
         final BigArrays bigArrays = mock(BigArrays.class);
-        final TransportService transportService = mock(TransportService.class);
+        final TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor();
         final CcrRestoreSourceService ccrRestoreSourceService = mock(CcrRestoreSourceService.class);
 
-        MockUtils.setupTransportServiceWithThreadpoolExecutor(transportService);
         final var action = new GetCcrRestoreFileChunkAction.TransportAction(
             bigArrays,
             transportService,
@@ -84,7 +83,7 @@ public void testActionNames() {
     public void testRequestedShardIdMustBeConsistentWithSessionShardId() {
         final ActionFilters actionFilters = mock(ActionFilters.class);
         final BigArrays bigArrays = new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), ByteSizeValue.ofBytes(1024));
-        final TransportService transportService = mock(TransportService.class);
+        final TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor();
         final CcrRestoreSourceService ccrRestoreSourceService = mock(CcrRestoreSourceService.class);
 
         final String sessionUUID = UUIDs.randomBase64UUID();
@@ -105,7 +104,6 @@ public void testRequestedShardIdMustBeConsistentWithSessionShardId() {
             }
         }).when(ccrRestoreSourceService).ensureSessionShardIdConsistency(anyString(), any());
 
-        MockUtils.setupTransportServiceWithThreadpoolExecutor(transportService);
         final var action = new GetCcrRestoreFileChunkAction.TransportAction(
             bigArrays,
             transportService,