diff options
author | Jim Ferenczi <jim.ferenczi@elastic.co> | 2017-05-30 11:06:54 +0200 |
---|---|---|
committer | Jim Ferenczi <jim.ferenczi@elastic.co> | 2017-05-30 11:06:54 +0200 |
commit | fc35d51c3cd2a98668e67cc53f5cef2b5a19b50d (patch) | |
tree | 9f110ec4215784f3b9d44d905b557139cdc6c28e /core/src/test/java/org/elasticsearch/search | |
parent | eea010b40863f1577992a6a010c4c86e282527a0 (diff) |
[TEST] Fix FieldSortIT failures
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search')
-rw-r--r-- | core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java b/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java index 8e1c1f544e..20fd7fd378 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java +++ b/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java @@ -1526,14 +1526,18 @@ public class FieldSortIT extends ESIntegTestCase { } public void testScriptFieldSort() throws Exception { - createIndex("test"); + assertAcked(prepareCreate("test") + .addMapping("t", "keyword", "type=keyword", "number", "type=integer")); ensureGreen(); final int numDocs = randomIntBetween(10, 20); IndexRequestBuilder[] indexReqs = new IndexRequestBuilder[numDocs]; + List<String> keywords = new ArrayList<>(); for (int i = 0; i < numDocs; ++i) { indexReqs[i] = client().prepareIndex("test", "t") - .setSource("number", Integer.toString(i)); + .setSource("number", i, "keyword", Integer.toString(i)); + keywords.add(Integer.toString(i)); } + Collections.sort(keywords); indexRandom(true, indexReqs); { @@ -1545,7 +1549,7 @@ public class FieldSortIT extends ESIntegTestCase { .addSort(SortBuilders.scoreSort()) .execute().actionGet(); - int expectedValue = 0; + double expectedValue = 0; for (SearchHit hit : searchResponse.getHits()) { assertThat(hit.getSortValues().length, equalTo(2)); assertThat(hit.getSortValues()[0], equalTo(expectedValue++)); @@ -1565,7 +1569,7 @@ public class FieldSortIT extends ESIntegTestCase { int expectedValue = 0; for (SearchHit hit : searchResponse.getHits()) { assertThat(hit.getSortValues().length, equalTo(2)); - assertThat(hit.getSortValues()[0], equalTo(Integer.toString(expectedValue++))); + assertThat(hit.getSortValues()[0], equalTo(keywords.get(expectedValue++))); assertThat(hit.getSortValues()[1], equalTo(1f)); } } |