Remove RolloverIndexTestHelper

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java

@@ -71,6 +71,10 @@ public final String toString() {
         return "[" + name + ": " + value + "]";
     }
 
+    public T value() {
+        return value;
+    }
+
     /**
      * Holder for index stats used to evaluate conditions
      */

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java

@@ -196,7 +196,7 @@ public boolean isDryRun() {
         return dryRun;
     }
 
-    Map<String, Condition<?>> getConditions() {
+    public Map<String, Condition<?>> getConditions() {
         return conditions;
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java

@@ -68,8 +68,8 @@ public final class RolloverResponse extends ShardsAcknowledgedResponse implement
     RolloverResponse() {
     }
 
-    RolloverResponse(String oldIndex, String newIndex, Map<String, Boolean> conditionResults,
-                             boolean dryRun, boolean rolledOver, boolean acknowledged, boolean shardsAcknowledged) {
+    public RolloverResponse(String oldIndex, String newIndex, Map<String, Boolean> conditionResults,
+                            boolean dryRun, boolean rolledOver, boolean acknowledged, boolean shardsAcknowledged) {
         super(acknowledged, shardsAcknowledged);
         this.oldIndex = oldIndex;
         this.newIndex = newIndex;

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/RolloverStepTests.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.action.admin.indices.rollover.MaxAgeCondition;
 import org.elasticsearch.action.admin.indices.rollover.MaxDocsCondition;
 import org.elasticsearch.action.admin.indices.rollover.MaxSizeCondition;
-import org.elasticsearch.action.admin.indices.rollover.RolloverIndexTestHelper;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
 import org.elasticsearch.client.AdminClient;
@@ -29,9 +28,11 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.equalTo;
 
@@ -97,7 +98,19 @@ public RolloverStep copyInstance(RolloverStep instance) {
             instance.getMaxSize(), instance.getMaxAge(), instance.getMaxDocs());
     }
 
-    public void testPerformAction() throws Exception {
+    private static void assertRolloverIndexRequest(RolloverRequest request, String alias, Set<Condition<?>> expectedConditions) {
+        assertNotNull(request);
+        assertEquals(1, request.indices().length);
+        assertEquals(alias, request.indices()[0]);
+        assertEquals(alias, request.getAlias());
+        assertEquals(expectedConditions.size(), request.getConditions().size());
+        Set<Object> expectedConditionValues = expectedConditions.stream().map(Condition::value).collect(Collectors.toSet());
+        Set<Object> actualConditionValues = request.getConditions().values().stream()
+            .map(Condition::value).collect(Collectors.toSet());
+        assertEquals(expectedConditionValues, actualConditionValues);
+    }
+
+    public void testPerformAction() {
         String alias = randomAlphaOfLength(5);
         IndexMetaData indexMetaData = IndexMetaData.builder(randomAlphaOfLength(10))
             .settings(settings(Version.CURRENT).put(RolloverAction.LIFECYCLE_ROLLOVER_ALIAS, alias))
@@ -127,8 +140,8 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
                 if (step.getMaxDocs() != null) {
                     expectedConditions.add(new MaxDocsCondition(step.getMaxDocs()));
                 }
-                RolloverIndexTestHelper.assertRolloverIndexRequest(request, alias, expectedConditions);
-                listener.onResponse(RolloverIndexTestHelper.createMockResponse(request, true));
+                assertRolloverIndexRequest(request, alias, expectedConditions);
+                listener.onResponse(new RolloverResponse(null, null, Collections.emptyMap(), request.isDryRun(), true, true, true));
                 return null;
             }
 
@@ -155,7 +168,7 @@ public void onFailure(Exception e) {
         Mockito.verify(indicesClient, Mockito.only()).rolloverIndex(Mockito.any(), Mockito.any());
     }
 
-    public void testPerformActionNotComplete() throws Exception {
+    public void testPerformActionNotComplete() {
         String alias = randomAlphaOfLength(5);
         IndexMetaData indexMetaData = IndexMetaData.builder(randomAlphaOfLength(10))
             .settings(settings(Version.CURRENT).put(RolloverAction.LIFECYCLE_ROLLOVER_ALIAS, alias))
@@ -184,8 +197,8 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
                 if (step.getMaxDocs() != null) {
                     expectedConditions.add(new MaxDocsCondition(step.getMaxDocs()));
                 }
-                RolloverIndexTestHelper.assertRolloverIndexRequest(request, alias, expectedConditions);
-                listener.onResponse(RolloverIndexTestHelper.createMockResponse(request, false));
+                assertRolloverIndexRequest(request, alias, expectedConditions);
+                listener.onResponse(new RolloverResponse(null, null, Collections.emptyMap(), request.isDryRun(), false, true, true));
                 return null;
             }
 
@@ -212,7 +225,7 @@ public void onFailure(Exception e) {
         Mockito.verify(indicesClient, Mockito.only()).rolloverIndex(Mockito.any(), Mockito.any());
     }
 
-    public void testPerformActionFailure() throws Exception {
+    public void testPerformActionFailure() {
         String alias = randomAlphaOfLength(5);
         IndexMetaData indexMetaData = IndexMetaData.builder(randomAlphaOfLength(10))
             .settings(settings(Version.CURRENT).put(RolloverAction.LIFECYCLE_ROLLOVER_ALIAS, alias))
@@ -242,7 +255,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
                 if (step.getMaxDocs() != null) {
                     expectedConditions.add(new MaxDocsCondition(step.getMaxDocs()));
                 }
-                RolloverIndexTestHelper.assertRolloverIndexRequest(request, alias, expectedConditions);
+                assertRolloverIndexRequest(request, alias, expectedConditions);
                 listener.onFailure(exception);
                 return null;
             }