honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation in SecurityMocks 

This commit fixes compilation in SecurityMocks from what appears to be
some merge conflicts that were not resolved adequately.
This commit is contained in:
Jason Tedor 2019-05-01 14:29:33 -04:00
parent f500d727cf
commit 0870523489
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityMocks.java
View File

@ -21,7 +21,7 @@ import java.util.function.Consumer;
import static java.util.Collections.emptyMap; import static java.util.Collections.emptyMap;
import static org.elasticsearch.index.mapper.MapperService.SINGLE_MAPPING_NAME; import static org.elasticsearch.index.mapper.MapperService.SINGLE_MAPPING_NAME;
import static org.elasticsearch.xpack.core.security.index.RestrictedIndicesNames.SECURITY_INDEX_NAME; import static org.elasticsearch.xpack.core.security.index.RestrictedIndicesNames.SECURITY_MAIN_ALIAS;
import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
@ -65,23 +65,23 @@ public final class SecurityMocks {
} }
public static void mockGetRequest(Client client, String documentId, BytesReference source) { public static void mockGetRequest(Client client, String documentId, BytesReference source) {
GetResult result = new GetResult(SECURITY_INDEX_NAME, SINGLE_MAPPING_NAME, documentId, 0, 1, 1, true, source, emptyMap()); GetResult result = new GetResult(SECURITY_MAIN_ALIAS, SINGLE_MAPPING_NAME, documentId, 0, 1, 1, true, source, emptyMap());
mockGetRequest(client, documentId, result); mockGetRequest(client, documentId, result);
} }
public static void mockGetRequest(Client client, String documentId, GetResult result) { public static void mockGetRequest(Client client, String documentId, GetResult result) {
final GetRequestBuilder requestBuilder = new GetRequestBuilder(client, GetAction.INSTANCE); final GetRequestBuilder requestBuilder = new GetRequestBuilder(client, GetAction.INSTANCE);
requestBuilder.setIndex(SECURITY_INDEX_NAME); requestBuilder.setIndex(SECURITY_MAIN_ALIAS);
requestBuilder.setType(SINGLE_MAPPING_NAME); requestBuilder.setType(SINGLE_MAPPING_NAME);
requestBuilder.setId(documentId); requestBuilder.setId(documentId);
when(client.prepareGet(SECURITY_INDEX_NAME, SINGLE_MAPPING_NAME, documentId)).thenReturn(requestBuilder); when(client.prepareGet(SECURITY_MAIN_ALIAS, SINGLE_MAPPING_NAME, documentId)).thenReturn(requestBuilder);
doAnswer(inv -> { doAnswer(inv -> {
Assert.assertThat(inv.getArguments(), arrayWithSize(2)); Assert.assertThat(inv.getArguments(), arrayWithSize(2));
Assert.assertThat(inv.getArguments()[0], instanceOf(GetRequest.class)); Assert.assertThat(inv.getArguments()[0], instanceOf(GetRequest.class));
final GetRequest request = (GetRequest) inv.getArguments()[0]; final GetRequest request = (GetRequest) inv.getArguments()[0];
Assert.assertThat(request.id(), equalTo(documentId)); Assert.assertThat(request.id(), equalTo(documentId));
Assert.assertThat(request.index(), equalTo(SECURITY_INDEX_NAME)); Assert.assertThat(request.index(), equalTo(SECURITY_MAIN_ALIAS));
Assert.assertThat(request.type(), equalTo(SINGLE_MAPPING_NAME)); Assert.assertThat(request.type(), equalTo(SINGLE_MAPPING_NAME));
Assert.assertThat(inv.getArguments()[1], instanceOf(ActionListener.class)); Assert.assertThat(inv.getArguments()[1], instanceOf(ActionListener.class));