[Testing] Refactor RestActionTests to cover all rest methods (#74489)

Refactoring RestGetActionTests and RestGestSourceActionTests to remove
duplicated code. Previously the tests would fail if rest request was
sent twice to RestController. This was fixed in #74293 and the
refactoring is possible now

Author: pgomulka

server/src/test/java/org/elasticsearch/rest/action/document/RestGetActionTests.java

@@ -35,19 +35,16 @@ public void setUpAction() {
         });
     }
 
-    public void testTypeInPathWithGet() {
-        FakeRestRequest.Builder deprecatedRequest = new FakeRestRequest.Builder(xContentRegistry()).withHeaders(
-            Map.of("Content-Type", contentTypeHeader, "Accept", contentTypeHeader)
-        ).withPath("/some_index/some_type/some_id");
-        dispatchRequest(deprecatedRequest.withMethod(RestRequest.Method.GET).build());
-        assertWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE);
+    public void testTypeInPath() {
+        testTypeInPath(RestRequest.Method.GET);
+        testTypeInPath(RestRequest.Method.HEAD);
     }
 
-    public void testTypeInPathWithHead() {
+    private void testTypeInPath(RestRequest.Method method) {
         FakeRestRequest.Builder deprecatedRequest = new FakeRestRequest.Builder(xContentRegistry()).withHeaders(
             Map.of("Content-Type", contentTypeHeader, "Accept", contentTypeHeader)
         ).withPath("/some_index/some_type/some_id");
-        dispatchRequest(deprecatedRequest.withMethod(RestRequest.Method.HEAD).build());
+        dispatchRequest(deprecatedRequest.withMethod(method).build());
         assertWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE);
     }
 }

server/src/test/java/org/elasticsearch/rest/action/document/RestGetSourceActionTests.java

@@ -25,6 +25,7 @@
 import org.junit.Before;
 import org.mockito.Mockito;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -92,53 +93,34 @@ public void testRestGetSourceActionWithMissingDocumentSource() {
     /**
      * test deprecation is logged if type is used in path
      */
-    public void testTypeInGetPath() {
-        RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
-            .withHeaders(Map.of("Accept", compatibleMediaType))
-            .withMethod(RestRequest.Method.HEAD)
-            .withPath("/some_index/some_type/id/_source")
-            .build();
-        dispatchRequest(request);
-        assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
-    }
-
-    public void testTypeInHeadPath() {
-        RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
-            .withHeaders(Map.of("Accept", compatibleMediaType))
-            .withMethod(RestRequest.Method.GET)
-            .withPath("/some_index/some_type/id/_source")
-            .build();
-        dispatchRequest(request);
-        assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
+    public void testTypeInPath() {
+        for (RestRequest.Method method : Arrays.asList(RestRequest.Method.GET, RestRequest.Method.HEAD)) {
+            RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
+                .withHeaders(Map.of("Accept", compatibleMediaType))
+                .withMethod(method)
+                .withPath("/some_index/some_type/id/_source")
+                .build();
+            dispatchRequest(request);
+            assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
+        }
     }
 
     /**
      * test deprecation is logged if type is used as parameter
      */
-    public void testTypeParameterAndGet() {
-        Map<String, String> params = new HashMap<>();
-        params.put("type", "some_type");
-        RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
-            .withHeaders(Map.of("Accept", compatibleMediaType))
-            .withMethod(RestRequest.Method.GET)
-            .withPath("/some_index/_source/id")
-            .withParams(params)
-            .build();
-        dispatchRequest(request);
-        assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
-    }
-
-    public void testTypeParameterAndHead() {
+    public void testTypeParameter() {
         Map<String, String> params = new HashMap<>();
         params.put("type", "some_type");
-        RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
-            .withHeaders(Map.of("Accept", compatibleMediaType))
-            .withMethod(RestRequest.Method.HEAD)
-            .withPath("/some_index/_source/id")
-            .withParams(params)
-            .build();
-        dispatchRequest(request);
-        assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
+        for (RestRequest.Method method : Arrays.asList(RestRequest.Method.GET, RestRequest.Method.HEAD)) {
+            RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
+                .withHeaders(Map.of("Accept", compatibleMediaType))
+                .withMethod(method)
+                .withPath("/some_index/_source/id")
+                .withParams(params)
+                .build();
+            dispatchRequest(request);
+            assertWarnings(RestGetSourceAction.TYPES_DEPRECATION_MESSAGE);
+        }
     }
 
 }