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

Fix (some) mocking issues due to upstream changes. 

Two suites marked as awaitsFix while being worked on.

Original commit: elastic/x-pack-elasticsearch@06eb352b1e
This commit is contained in:
Zachary Tong 2017-02-08 10:35:15 -05:00
parent 30b6425b3a
commit 99ce9be6ca
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elasticsearch/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/chunked/ChunkedDataExtractorTests.java
View File

@ -13,6 +13,7 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.mock.orig.Mockito;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.aggregations.Aggregations;
import org.elasticsearch.test.ESTestCase;
@ -406,8 +407,8 @@ public class ChunkedDataExtractorTests extends ESTestCase {
private SearchResponse createSearchResponse(long totalHits, long earliestTime, long latestTime) {
SearchResponse searchResponse = mock(SearchResponse.class);
when(searchResponse.status()).thenReturn(RestStatus.OK);
SearchHits searchHits = mock(SearchHits.class);
when(searchHits.getTotalHits()).thenReturn(totalHits);
SearchHit[] hits = new SearchHit[(int)totalHits];
SearchHits searchHits = new SearchHits(hits, totalHits, 1);
when(searchResponse.getHits()).thenReturn(searchHits);
Aggregations aggs = mock(Aggregations.class);

4
elasticsearch/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java
View File

@ -282,7 +282,6 @@ public class ScrollDataExtractorTests extends ESTestCase {
SearchResponse searchResponse = mock(SearchResponse.class);
when(searchResponse.status()).thenReturn(RestStatus.OK);
when(searchResponse.getScrollId()).thenReturn(randomAsciiOfLength(1000));
SearchHits searchHits = mock(SearchHits.class);
List<SearchHit> hits = new ArrayList<>();
for (int i = 0; i < timestamps.size(); i++) {
SearchHit hit = new SearchHit(randomInt());
@ -293,8 +292,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
hit.fields(fields);
hits.add(hit);
}
when(searchHits.getHits()).thenReturn(hits.toArray(new SearchHit[hits.size()]));
when(searchHits.getHits()).thenReturn(hits.toArray(new SearchHit[hits.size()]));
SearchHits searchHits = new SearchHits(hits.toArray(new SearchHit[0]), hits.size(), 1);
when(searchResponse.getHits()).thenReturn(searchHits);
return searchResponse;
}

14
elasticsearch/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobDataDeleterTests.java
View File

@ -5,11 +5,13 @@
*/
package org.elasticsearch.xpack.ml.job.persistence;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.delete.DeleteRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.ESTestCase;
@ -18,6 +20,7 @@ import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelState;
import org.mockito.Mockito;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -29,6 +32,7 @@ import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
@LuceneTestCase.AwaitsFix(bugUrl = "[zach] fixing mocking")
public class JobDataDeleterTests extends ESTestCase {
public void testDeleteResultsFromTime() {
@ -106,18 +110,14 @@ public class JobDataDeleterTests extends ESTestCase {
private SearchHits mockSearchHits(long totalHitCount, int hitsPerSearchResult) {
SearchHits hits = Mockito.mock(SearchHits.class);
when(hits.getTotalHits()).thenReturn(totalHitCount);
SearchHits hits = new SearchHits(new SearchHit[(int)totalHitCount], totalHitCount, 1);
List<SearchHit> hitList = new ArrayList<>();
for (int i=0; i<20; i++) {
SearchHit hit = Mockito.mock(SearchHit.class);
when(hit.getType()).thenReturn("mockSearchHit");
when(hit.getId()).thenReturn("mockSeachHit-" + i);
SearchHit hit = new SearchHit(123, "mockSeachHit-" + i,
new Text("mockSearchHit"), Collections.emptyMap());
hitList.add(hit);
}
when(hits.getHits()).thenReturn(hitList.toArray(new SearchHit[hitList.size()]));
when(hits.getHits()).thenReturn(hitList.toArray(new SearchHit[hitList.size()]));
return hits;
}

25
elasticsearch/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobProviderTests.java
View File

@ -5,6 +5,7 @@
*/
package org.elasticsearch.xpack.ml.job.persistence;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
@ -16,6 +17,7 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.SearchHit;
@ -47,6 +49,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@ -67,6 +70,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@LuceneTestCase.AwaitsFix(bugUrl = "[Zach] Fixing mocking")
public class JobProviderTests extends ESTestCase {
private static final String CLUSTER_NAME = "myCluster";
private static final String JOB_ID = "foo";
@ -1159,25 +1163,22 @@ public class JobProviderTests extends ESTestCase {
private static SearchResponse createSearchResponse(boolean exists, List<Map<String, Object>> source) throws IOException {
SearchResponse response = mock(SearchResponse.class);
SearchHits hits = mock(SearchHits.class);
List<SearchHit> list = new ArrayList<>();
for (Map<String, Object> map : source) {
SearchHit hit = mock(SearchHit.class);
Map<String, Object> _source = new HashMap<>(map);
when(hit.getSourceRef()).thenReturn(XContentFactory.jsonBuilder().map(_source).bytes());
when(hit.getId()).thenReturn(String.valueOf(map.hashCode()));
doAnswer(invocation -> {
String field = (String) invocation.getArguments()[0];
SearchHitField shf = mock(SearchHitField.class);
when(shf.getValue()).thenReturn(map.get(field));
return shf;
}).when(hit).field(any(String.class));
Map<String, SearchHitField> fields = new HashMap<>();
fields.put("field_1", new SearchHitField("field_1", Arrays.asList("foo")));
fields.put("field_2", new SearchHitField("field_2", Arrays.asList("foo")));
SearchHit hit = new SearchHit(123, String.valueOf(map.hashCode()), new Text("foo"), fields)
.sourceRef(XContentFactory.jsonBuilder().map(_source).bytes());
list.add(hit);
}
SearchHits hits = new SearchHits(list.toArray(new SearchHit[0]), source.size(), 1);
when(response.getHits()).thenReturn(hits);
when(hits.getHits()).thenReturn(list.toArray(new SearchHit[0]));
when(hits.getTotalHits()).thenReturn((long) source.size());
doAnswer(invocation -> {
Integer idx = (Integer) invocation.getArguments()[0];