Skip to content

Commit 0a3bc83

Browse files
committed
Reduce test duplication
1 parent d089204 commit 0a3bc83

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

server/src/test/java/org/elasticsearch/action/datastreams/autosharding/DataStreamAutoShardingServiceTests.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,15 +1347,8 @@ private static Decision.Inputs createDecisionInputsForPeriodLoggerTests(int writ
13471347
public void testCalculateReturnsNotApplicableForLookupIndexMode() {
13481348
var projectId = randomProjectIdOrDefault();
13491349
ProjectMetadata.Builder builder = ProjectMetadata.builder(projectId);
1350-
DataStream dataStream = DataStream.builder(dataStreamName, List.of(new Index("test-index", randomUUID())))
1351-
.setGeneration(1)
1352-
.setIndexMode(IndexMode.LOOKUP)
1353-
.build();
1354-
builder.put(dataStream);
1355-
ClusterState state = ClusterState.builder(ClusterName.DEFAULT)
1356-
.nodes(DiscoveryNodes.builder().add(DiscoveryNodeUtils.create("n1")))
1357-
.putProjectMetadata(builder.build())
1358-
.build();
1350+
DataStream dataStream = createLookupModeDataStream(builder);
1351+
ClusterState state = createClusterStateWithDataStream(builder);
13591352

13601353
AutoShardingResult autoShardingResult = service.calculate(
13611354
state.projectState(projectId),
@@ -1369,18 +1362,27 @@ public void testCalculateReturnsNotApplicableForLookupIndexMode() {
13691362
public void testCalculateReturnsNotApplicableForLookupIndexModeWithNullStats() {
13701363
var projectId = randomProjectIdOrDefault();
13711364
ProjectMetadata.Builder builder = ProjectMetadata.builder(projectId);
1365+
DataStream dataStream = createLookupModeDataStream(builder);
1366+
ClusterState state = createClusterStateWithDataStream(builder);
1367+
1368+
AutoShardingResult autoShardingResult = service.calculate(state.projectState(projectId), dataStream, null);
1369+
assertThat(autoShardingResult, is(NOT_APPLICABLE_RESULT));
1370+
assertThat(decisionsLogged, hasSize(0));
1371+
}
1372+
1373+
private DataStream createLookupModeDataStream(ProjectMetadata.Builder builder) {
13721374
DataStream dataStream = DataStream.builder(dataStreamName, List.of(new Index("test-index", randomUUID())))
13731375
.setGeneration(1)
13741376
.setIndexMode(IndexMode.LOOKUP)
13751377
.build();
13761378
builder.put(dataStream);
1377-
ClusterState state = ClusterState.builder(ClusterName.DEFAULT)
1379+
return dataStream;
1380+
}
1381+
1382+
private ClusterState createClusterStateWithDataStream(ProjectMetadata.Builder builder) {
1383+
return ClusterState.builder(ClusterName.DEFAULT)
13781384
.nodes(DiscoveryNodes.builder().add(DiscoveryNodeUtils.create("n1")))
13791385
.putProjectMetadata(builder.build())
13801386
.build();
1381-
1382-
AutoShardingResult autoShardingResult = service.calculate(state.projectState(projectId), dataStream, null);
1383-
assertThat(autoShardingResult, is(NOT_APPLICABLE_RESULT));
1384-
assertThat(decisionsLogged, hasSize(0));
13851387
}
13861388
}

0 commit comments

Comments
 (0)