Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/208128
Change subject: Make max_expanded_terms test more consistent ...................................................................... Make max_expanded_terms test more consistent Change-Id: I43b312d8b5a43b02825a805c2c7cd5c81289f724 --- M experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/integration/MiscellaneousTest.java 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/28/208128/1 diff --git a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/integration/MiscellaneousTest.java b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/integration/MiscellaneousTest.java index 9b896e7..02bd26d 100644 --- a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/integration/MiscellaneousTest.java +++ b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/integration/MiscellaneousTest.java @@ -1,6 +1,8 @@ package org.wikimedia.highlighter.experimental.elasticsearch.integration; +import static org.elasticsearch.index.query.FilterBuilders.idsFilter; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; +import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; import static org.elasticsearch.index.query.QueryBuilders.fuzzyQuery; import static org.elasticsearch.index.query.QueryBuilders.matchPhrasePrefixQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; @@ -364,13 +366,14 @@ */ @Test public void singleRangeQueryWithSmallRewrites() throws IOException { - buildIndex(); + buildIndex(true, true, 1); client().prepareIndex("test", "test", "2").setSource("test", "test").get(); indexTestData(); Map<String, Object> options = new HashMap<String, Object>(); options.put("max_expanded_terms", 1); - SearchRequestBuilder search = testSearch(rangeQuery("test").from("teso").to("tesz")).setHighlighterOptions(options); + SearchRequestBuilder search = testSearch(filteredQuery(rangeQuery("test").from("teso").to("tesz"), idsFilter("test").addIds("1"))) + .setHighlighterOptions(options); for (String hitSource : HIT_SOURCES) { options.put("hit_source", hitSource); SearchResponse response = search.get(); -- To view, visit https://gerrit.wikimedia.org/r/208128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43b312d8b5a43b02825a805c2c7cd5c81289f724 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles <never...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits