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

Fix a knock-on effect of removing JobLogs 

Original commit: elastic/x-pack-elasticsearch@501fcda045
This commit is contained in:
David Roberts 2016-11-21 15:49:26 +00:00
parent c1d8b31b0e
commit c6d52cd949
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/persistence/ElasticsearchJobProviderTests.java
View File

@ -17,6 +17,7 @@ import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField; import org.elasticsearch.search.SearchHitField;
import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.xpack.prelert.action.DeleteJobAction;
import org.elasticsearch.xpack.prelert.job.AnalysisLimits; import org.elasticsearch.xpack.prelert.job.AnalysisLimits;
import org.elasticsearch.xpack.prelert.job.CategorizerState; import org.elasticsearch.xpack.prelert.job.CategorizerState;
import org.elasticsearch.xpack.prelert.job.Job; import org.elasticsearch.xpack.prelert.job.Job;
@ -163,7 +164,7 @@ public class ElasticsearchJobProviderTests extends ESTestCase {
public void testDeleteJob() throws InterruptedException, ExecutionException, IOException { public void testDeleteJob() throws InterruptedException, ExecutionException, IOException {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ActionListener<Boolean> actionListener = mock(ActionListener.class); ActionListener<DeleteJobAction.Response> actionListener = mock(ActionListener.class);
String jobId = "ThisIsMyJob"; String jobId = "ThisIsMyJob";
MockClientBuilder clientBuilder = new MockClientBuilder(CLUSTER_NAME).addClusterStatusYellowResponse() MockClientBuilder clientBuilder = new MockClientBuilder(CLUSTER_NAME).addClusterStatusYellowResponse()
.addIndicesExistsResponse(ElasticsearchJobProvider.PRELERT_USAGE_INDEX, true); .addIndicesExistsResponse(ElasticsearchJobProvider.PRELERT_USAGE_INDEX, true);
@ -176,12 +177,14 @@ public class ElasticsearchJobProviderTests extends ESTestCase {
provider.deleteJobRelatedIndices(jobId, actionListener); provider.deleteJobRelatedIndices(jobId, actionListener);
verify(actionListener).onResponse(true); ArgumentCaptor<DeleteJobAction.Response> responseCaptor = ArgumentCaptor.forClass(DeleteJobAction.Response.class);
verify(actionListener).onResponse(responseCaptor.capture());
assertTrue(responseCaptor.getValue().isAcknowledged());
} }
public void testDeleteJob_InvalidIndex() throws InterruptedException, ExecutionException, IOException { public void testDeleteJob_InvalidIndex() throws InterruptedException, ExecutionException, IOException {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ActionListener<Boolean> actionListener = mock(ActionListener.class); ActionListener<DeleteJobAction.Response> actionListener = mock(ActionListener.class);
String jobId = "ThisIsMyJob"; String jobId = "ThisIsMyJob";
MockClientBuilder clientBuilder = new MockClientBuilder(CLUSTER_NAME).addClusterStatusYellowResponse() MockClientBuilder clientBuilder = new MockClientBuilder(CLUSTER_NAME).addClusterStatusYellowResponse()
.addIndicesExistsResponse(ElasticsearchJobProvider.PRELERT_USAGE_INDEX, true); .addIndicesExistsResponse(ElasticsearchJobProvider.PRELERT_USAGE_INDEX, true);

5
elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/job/persistence/MockClientBuilder.java
View File

@ -58,6 +58,7 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.script.Script; import org.elasticsearch.script.Script;
import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.xpack.prelert.action.DeleteJobAction;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatcher;
import org.mockito.Mock; import org.mockito.Mock;
@ -161,7 +162,7 @@ public class MockClientBuilder {
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({ "unchecked" })
public MockClientBuilder addIndicesDeleteResponse(String index, boolean exists, boolean exception, public MockClientBuilder addIndicesDeleteResponse(String index, boolean exists, boolean exception,
ActionListener<Boolean> actionListener) throws InterruptedException, ExecutionException, IOException { ActionListener<DeleteJobAction.Response> actionListener) throws InterruptedException, ExecutionException, IOException {
DeleteIndexResponse response = DeleteIndexAction.INSTANCE.newResponse(); DeleteIndexResponse response = DeleteIndexAction.INSTANCE.newResponse();
StreamInput si = mock(StreamInput.class); StreamInput si = mock(StreamInput.class);
when(si.readByte()).thenReturn((byte) 0x41); when(si.readByte()).thenReturn((byte) 0x41);
@ -174,7 +175,7 @@ public class MockClientBuilder {
if (exception) { if (exception) {
actionListener.onFailure(new InterruptedException()); actionListener.onFailure(new InterruptedException());
} else { } else {
actionListener.onResponse(true); actionListener.onResponse(new DeleteJobAction.Response(true));
} }
return null; return null;
}).when(indicesAdminClient).delete(any(DeleteIndexRequest.class), any(ActionListener.class)); }).when(indicesAdminClient).delete(any(DeleteIndexRequest.class), any(ActionListener.class));