Skip to content

Commit b68885c

Browse files
committed
Fix unit tests
1 parent 99f280e commit b68885c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ public String toString() {
536536
+ ",indexRouting=" + indexRouting
537537
+ ",searchRouting=" + searchRouting
538538
+ ",writeIndex=" + writeIndex
539+
+ ",isHidden=" + isHidden
539540
+ "]";
540541
}
541542

@@ -553,12 +554,13 @@ public boolean equals(Object obj) {
553554
&& Objects.equals(routing, other.routing)
554555
&& Objects.equals(indexRouting, other.indexRouting)
555556
&& Objects.equals(searchRouting, other.searchRouting)
556-
&& Objects.equals(writeIndex, other.writeIndex);
557+
&& Objects.equals(writeIndex, other.writeIndex)
558+
&& Objects.equals(isHidden, other.isHidden);
557559
}
558560

559561
@Override
560562
public int hashCode() {
561-
return Objects.hash(type, indices, aliases, filter, routing, indexRouting, searchRouting, writeIndex);
563+
return Objects.hash(type, indices, aliases, filter, routing, indexRouting, searchRouting, writeIndex, isHidden);
562564
}
563565
}
564566

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void testCreateStateIndexAndAliasIfNecessary_WriteAliasAlreadyExistsAndPo
157157
assertThat(
158158
indicesAliasesRequest.getAliasActions(),
159159
contains(
160-
AliasActions.add().alias(TEST_INDEX_ALIAS).index(FIRST_CONCRETE_INDEX),
160+
AliasActions.add().alias(TEST_INDEX_ALIAS).index(FIRST_CONCRETE_INDEX).isHidden(true),
161161
AliasActions.remove().alias(TEST_INDEX_ALIAS).index(LEGACY_INDEX_WITHOUT_SUFFIX)));
162162
}
163163

@@ -175,7 +175,7 @@ private void assertMlStateWriteAliasAddedToMostRecentMlStateIndex(List<String> e
175175
IndicesAliasesRequest indicesAliasesRequest = aliasesRequestCaptor.getValue();
176176
assertThat(
177177
indicesAliasesRequest.getAliasActions(),
178-
contains(AliasActions.add().alias(TEST_INDEX_ALIAS).index(expectedWriteIndexName)));
178+
contains(AliasActions.add().alias(TEST_INDEX_ALIAS).index(expectedWriteIndexName).isHidden(true)));
179179
}
180180

181181
public void testCreateStateIndexAndAliasIfNecessary_WriteAliasDoesNotExistButInitialStateIndexExists() {

0 commit comments

Comments
 (0)