From 61d88a8fdd94f51954ce6e787b2135e901ece832 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Thu, 3 May 2018 10:18:42 +0100
Subject: [PATCH] Makes all step tests use `randomStepKey()`
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/AbstractStepTestCase.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/DeleteStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ErrorStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ForceMergeStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/InitializePolicyContextStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/PhaseAfterStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ReplicasAllocatedStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/RolloverStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/SegmentCountStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ShrinkSetAliasStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ShrinkStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ShrunkShardsAllocatedStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/ShrunkenIndexCheckStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/TerminalPolicyStepTests.java
 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifec
 ycle/UpdateSettingsStepTests.java

---
 .../indexlifecycle/AbstractStepTestCase.java    |  5 ++++-
 .../core/indexlifecycle/DeleteStepTests.java    |  4 ++--
 .../core/indexlifecycle/ErrorStepTests.java     |  2 +-
 .../indexlifecycle/ForceMergeStepTests.java     | 12 ++++++------
 .../InitializePolicyContextStepTests.java       |  4 ++--
 .../indexlifecycle/PhaseAfterStepTests.java     |  4 ++--
 .../ReplicasAllocatedStepTests.java             |  4 ++--
 .../core/indexlifecycle/RolloverStepTests.java  |  5 ++---
 .../indexlifecycle/SegmentCountStepTests.java   | 17 ++++++++---------
 .../indexlifecycle/ShrinkSetAliasStepTests.java |  4 ++--
 .../core/indexlifecycle/ShrinkStepTests.java    |  4 ++--
 .../ShrunkShardsAllocatedStepTests.java         |  4 ++--
 .../ShrunkenIndexCheckStepTests.java            |  4 ++--
 .../indexlifecycle/TerminalPolicyStepTests.java |  4 ++--
 .../indexlifecycle/UpdateSettingsStepTests.java |  4 ++--
 15 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/AbstractStepTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/AbstractStepTestCase.java
index 30c5f295a1a..2757a0499aa 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/AbstractStepTestCase.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/AbstractStepTestCase.java
@@ -24,7 +24,10 @@ public abstract class AbstractStepTestCase<T extends Step> extends ESTestCase {
     }
 
     public static StepKey randomStepKey() {
-        return new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        String randomPhase = randomAlphaOfLength(10);
+        String randomAction = randomAlphaOfLength(10);
+        String randomStepName = randomAlphaOfLength(10);
+        return new StepKey(randomPhase, randomAction, randomStepName);
     }
 
     public void testStepNameNotError() {
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/DeleteStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/DeleteStepTests.java
index 4af508d6242..2a1f95ee5ac 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/DeleteStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/DeleteStepTests.java
@@ -34,8 +34,8 @@ public class DeleteStepTests extends AbstractStepTestCase<DeleteStep> {
 
     @Override
     public DeleteStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
 
         return new DeleteStep(stepKey, nextStepKey, client);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ErrorStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ErrorStepTests.java
index 1f7cf109e6f..5bd0cdf230d 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ErrorStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ErrorStepTests.java
@@ -32,7 +32,7 @@ public class ErrorStepTests extends AbstractStepTestCase<ErrorStep> {
     }
 
     public void testInvalidStepKey() {
-        StepKey invalidKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey invalidKey = randomStepKey();
         IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> new ErrorStep(invalidKey));
         assertEquals("An error step must have a step key whose step name is " + ErrorStep.NAME, exception.getMessage());
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ForceMergeStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ForceMergeStepTests.java
index cbdeece2fd9..9a38ddf3a26 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ForceMergeStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ForceMergeStepTests.java
@@ -28,8 +28,8 @@ public class ForceMergeStepTests extends AbstractStepTestCase<ForceMergeStep> {
 
     @Override
     public ForceMergeStep createRandomInstance() {
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int maxNumSegments = randomIntBetween(1, 10);
 
         return new ForceMergeStep(stepKey, nextStepKey, null, maxNumSegments);
@@ -67,8 +67,8 @@ public class ForceMergeStepTests extends AbstractStepTestCase<ForceMergeStep> {
     public void testPerformActionComplete() {
         IndexMetaData indexMetaData = IndexMetaData.builder(randomAlphaOfLength(10)).settings(settings(Version.CURRENT))
             .numberOfShards(randomIntBetween(1, 5)).numberOfReplicas(randomIntBetween(0, 5)).build();
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int maxNumSegments = randomIntBetween(1, 10);
         Client client = mock(Client.class);
         AdminClient adminClient = mock(AdminClient.class);
@@ -106,8 +106,8 @@ public class ForceMergeStepTests extends AbstractStepTestCase<ForceMergeStep> {
         IndexMetaData indexMetaData = IndexMetaData.builder(randomAlphaOfLength(10)).settings(settings(Version.CURRENT))
             .numberOfShards(randomIntBetween(1, 5)).numberOfReplicas(randomIntBetween(0, 5)).build();
         Exception exception = new RuntimeException("error");
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int maxNumSegments = randomIntBetween(1, 10);
         Client client = mock(Client.class);
         AdminClient adminClient = mock(AdminClient.class);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/InitializePolicyContextStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/InitializePolicyContextStepTests.java
index 9f9a5339218..b4096b10541 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/InitializePolicyContextStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/InitializePolicyContextStepTests.java
@@ -20,8 +20,8 @@ public class InitializePolicyContextStepTests extends AbstractStepTestCase<Initi
 
     @Override
     public InitializePolicyContextStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
 
         return new InitializePolicyContextStep(stepKey, nextStepKey);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/PhaseAfterStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/PhaseAfterStepTests.java
index ebc7657c98f..4d90ff8cd3e 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/PhaseAfterStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/PhaseAfterStepTests.java
@@ -21,8 +21,8 @@ public class PhaseAfterStepTests extends AbstractStepTestCase<PhaseAfterStep> {
 
     @Override
     public PhaseAfterStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         TimeValue after = createRandomTimeValue();
         return new PhaseAfterStep(null, after, stepKey, nextStepKey);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ReplicasAllocatedStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ReplicasAllocatedStepTests.java
index 2183111953d..3eeb7df0339 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ReplicasAllocatedStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ReplicasAllocatedStepTests.java
@@ -28,8 +28,8 @@ public class ReplicasAllocatedStepTests extends AbstractStepTestCase<ReplicasAll
 
     @Override
     public ReplicasAllocatedStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int numberReplicas = randomIntBetween(0, 100);
         return new ReplicasAllocatedStep(stepKey, nextStepKey, numberReplicas);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/RolloverStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/RolloverStepTests.java
index 59705c14ea8..7eb340b5722 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/RolloverStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/RolloverStepTests.java
@@ -46,9 +46,8 @@ public class RolloverStepTests extends AbstractStepTestCase<RolloverStep> {
 
     @Override
     public RolloverStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        String alias = randomAlphaOfLengthBetween(1, 20);
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         ByteSizeUnit maxSizeUnit = randomFrom(ByteSizeUnit.values());
         ByteSizeValue maxSize = randomBoolean() ? null : new ByteSizeValue(randomNonNegativeLong() / maxSizeUnit.toBytes(1), maxSizeUnit);
         Long maxDocs = randomBoolean() ? null : randomNonNegativeLong();
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/SegmentCountStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/SegmentCountStepTests.java
index 3f52502f5c3..5f7bdb47274 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/SegmentCountStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/SegmentCountStepTests.java
@@ -18,7 +18,6 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.engine.Segment;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.xpack.core.indexlifecycle.Step.StepKey;
-
 import org.mockito.Mockito;
 
 import java.util.ArrayList;
@@ -34,8 +33,8 @@ public class SegmentCountStepTests extends AbstractStepTestCase<SegmentCountStep
 
     @Override
     public SegmentCountStep createRandomInstance() {
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int maxNumSegments = randomIntBetween(1, 10);
         boolean bestCompression = randomBoolean();
 
@@ -101,8 +100,8 @@ public class SegmentCountStepTests extends AbstractStepTestCase<SegmentCountStep
         Mockito.when(client.admin()).thenReturn(adminClient);
         Mockito.when(adminClient.indices()).thenReturn(indicesClient);
 
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         boolean bestCompression = randomBoolean();
 
         Mockito.doAnswer(invocationOnMock -> {
@@ -156,8 +155,8 @@ public class SegmentCountStepTests extends AbstractStepTestCase<SegmentCountStep
         Mockito.when(client.admin()).thenReturn(adminClient);
         Mockito.when(adminClient.indices()).thenReturn(indicesClient);
 
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         boolean bestCompression = randomBoolean();
 
         Mockito.doAnswer(invocationOnMock -> {
@@ -194,8 +193,8 @@ public class SegmentCountStepTests extends AbstractStepTestCase<SegmentCountStep
         Mockito.when(client.admin()).thenReturn(adminClient);
         Mockito.when(adminClient.indices()).thenReturn(indicesClient);
 
-        Step.StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        Step.StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int maxNumSegments = randomIntBetween(3, 10);
         boolean bestCompression = randomBoolean();
 
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkSetAliasStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkSetAliasStepTests.java
index ad2bdd3ed17..e368e9596e6 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkSetAliasStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkSetAliasStepTests.java
@@ -40,8 +40,8 @@ public class ShrinkSetAliasStepTests extends AbstractStepTestCase<ShrinkSetAlias
 
     @Override
     public ShrinkSetAliasStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         String shrunkIndexPrefix = randomAlphaOfLength(10);
         return new ShrinkSetAliasStep(stepKey, nextStepKey, client, shrunkIndexPrefix);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkStepTests.java
index 5cdd4507a98..498c2f2def4 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrinkStepTests.java
@@ -42,8 +42,8 @@ public class ShrinkStepTests extends AbstractStepTestCase<ShrinkStep> {
 
     @Override
     public ShrinkStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int numberOfShards = randomIntBetween(1, 20);
         String shrunkIndexPrefix = randomAlphaOfLength(10);
         return new ShrinkStep(stepKey, nextStepKey, client, numberOfShards, shrunkIndexPrefix);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkShardsAllocatedStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkShardsAllocatedStepTests.java
index 1fb75700acc..9be69c57054 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkShardsAllocatedStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkShardsAllocatedStepTests.java
@@ -26,8 +26,8 @@ public class ShrunkShardsAllocatedStepTests extends AbstractStepTestCase<ShrunkS
 
     @Override
     public ShrunkShardsAllocatedStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         int numberOfShards = randomIntBetween(1, 10);
         String shrunkIndexPrefix = randomAlphaOfLength(10);
         return new ShrunkShardsAllocatedStep(stepKey, nextStepKey, numberOfShards, shrunkIndexPrefix);
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStepTests.java
index 2c5b8acf048..82b1d45c900 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStepTests.java
@@ -18,8 +18,8 @@ public class ShrunkenIndexCheckStepTests extends AbstractStepTestCase<ShrunkenIn
 
     @Override
     public ShrunkenIndexCheckStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         String shrunkIndexPrefix = randomAlphaOfLength(10);
         return new ShrunkenIndexCheckStep(stepKey, nextStepKey, shrunkIndexPrefix);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/TerminalPolicyStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/TerminalPolicyStepTests.java
index ce6ae4ad400..1db1523b5cd 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/TerminalPolicyStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/TerminalPolicyStepTests.java
@@ -11,8 +11,8 @@ public class TerminalPolicyStepTests extends AbstractStepTestCase<TerminalPolicy
 
     @Override
     public TerminalPolicyStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         return new TerminalPolicyStep(stepKey, nextStepKey);
     }
 
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/UpdateSettingsStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/UpdateSettingsStepTests.java
index 6a54b464549..b62e5ef0626 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/UpdateSettingsStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/UpdateSettingsStepTests.java
@@ -35,8 +35,8 @@ public class UpdateSettingsStepTests extends AbstractStepTestCase<UpdateSettings
 
     @Override
     public UpdateSettingsStep createRandomInstance() {
-        StepKey stepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
-        StepKey nextStepKey = new StepKey(randomAlphaOfLength(10), randomAlphaOfLength(10), randomAlphaOfLength(10));
+        StepKey stepKey = randomStepKey();
+        StepKey nextStepKey = randomStepKey();
         Settings settings = Settings.builder().put(randomAlphaOfLength(10), randomAlphaOfLength(10)).build();
 
         return new UpdateSettingsStep(stepKey, nextStepKey, client, settings);