From f0c026d1d9b1934c1228c0692f88cc862e936326 Mon Sep 17 00:00:00 2001 From: Luca Cavanna Date: Fri, 16 Jun 2017 17:46:45 +0200 Subject: [PATCH] [TEST] adapt test: delete index doesn't resolve to aliases anymore (elastic/x-pack-elasticsearch#1735) Original commit: elastic/x-pack-elasticsearch@49629ccea64700cec75d61e667534a19178e0db3 --- .../authz/IndicesAndAliasesResolverTests.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java b/plugin/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java index d73c12be5ae..d5e26c7a33c 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java @@ -21,6 +21,7 @@ import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsAction import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingAction; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; +import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesAction; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest; @@ -1107,12 +1108,22 @@ public class IndicesAndAliasesResolverTests extends ESTestCase { } public void testResolveAdminAction() { - DeleteIndexRequest request = new DeleteIndexRequest("*"); - Set indices = defaultIndicesResolver.resolve(request, metaData, buildAuthorizedIndices(user, DeleteIndexAction.NAME)); - String[] expectedIndices = new String[]{"bar", "bar-closed", "foofoobar", "foofoo", "foofoo-closed"}; - assertThat(indices.size(), equalTo(expectedIndices.length)); - assertThat(indices, hasItems(expectedIndices)); - assertThat(request.indices(), arrayContainingInAnyOrder(expectedIndices)); + { + RefreshRequest request = new RefreshRequest("*"); + Set indices = defaultIndicesResolver.resolve(request, metaData, buildAuthorizedIndices(user, DeleteIndexAction.NAME)); + String[] expectedIndices = new String[]{"bar", "foofoobar", "foofoo"}; + assertThat(indices.size(), equalTo(expectedIndices.length)); + assertThat(indices, hasItems(expectedIndices)); + assertThat(request.indices(), arrayContainingInAnyOrder(expectedIndices)); + } + { + DeleteIndexRequest request = new DeleteIndexRequest("*"); + Set indices = defaultIndicesResolver.resolve(request, metaData, buildAuthorizedIndices(user, DeleteIndexAction.NAME)); + String[] expectedIndices = new String[]{"bar", "bar-closed", "foofoo", "foofoo-closed"}; + assertThat(indices.size(), equalTo(expectedIndices.length)); + assertThat(indices, hasItems(expectedIndices)); + assertThat(request.indices(), arrayContainingInAnyOrder(expectedIndices)); + } } public void testIndicesExists() {