From c83ec1f1335ebd4323a41f95b55818f8cf6e43c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Fri, 15 Sep 2017 13:44:40 +0200 Subject: [PATCH] Fixing test after merging in master --- .../index/rankeval/RankEvalRequestIT.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java index a043d90564f..fdae133afc2 100644 --- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.rankeval; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.RangeQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.rankeval.PrecisionTests.Rating; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.search.builder.SearchSourceBuilder; @@ -54,12 +54,12 @@ public class RankEvalRequestIT extends ESIntegTestCase { ensureGreen(); client().prepareIndex("test", "testtype").setId("1") - .setSource("text", "berlin", "title", "Berlin, Germany").get(); - client().prepareIndex("test", "testtype").setId("2").setSource("text", "amsterdam").get(); - client().prepareIndex("test", "testtype").setId("3").setSource("text", "amsterdam").get(); - client().prepareIndex("test", "testtype").setId("4").setSource("text", "amsterdam").get(); - client().prepareIndex("test", "testtype").setId("5").setSource("text", "amsterdam").get(); - client().prepareIndex("test", "testtype").setId("6").setSource("text", "amsterdam").get(); + .setSource("text", "berlin", "title", "Berlin, Germany", "population", 3670622).get(); + client().prepareIndex("test", "testtype").setId("2").setSource("text", "amsterdam", "population", 851573).get(); + client().prepareIndex("test", "testtype").setId("3").setSource("text", "amsterdam", "population", 851573).get(); + client().prepareIndex("test", "testtype").setId("4").setSource("text", "amsterdam", "population", 851573).get(); + client().prepareIndex("test", "testtype").setId("5").setSource("text", "amsterdam", "population", 851573).get(); + client().prepareIndex("test", "testtype").setId("6").setSource("text", "amsterdam", "population", 851573).get(); refresh(); } @@ -147,8 +147,7 @@ public class RankEvalRequestIT extends ESIntegTestCase { specifications.add(amsterdamRequest); SearchSourceBuilder brokenQuery = new SearchSourceBuilder(); - RangeQueryBuilder brokenRangeQuery = new RangeQueryBuilder("text").timeZone("CET").from("Basel").to("Zehlendorf"); - brokenQuery.query(brokenRangeQuery); + brokenQuery.query(QueryBuilders.termQuery("population", "noStringOnNumericFields")); RatedRequest brokenRequest = new RatedRequest("broken_query", createRelevant("1"), brokenQuery); brokenRequest.setIndices(indices); @@ -166,8 +165,8 @@ public class RankEvalRequestIT extends ESIntegTestCase { assertEquals(1, response.getFailures().size()); ElasticsearchException[] rootCauses = ElasticsearchException .guessRootCauses(response.getFailures().get("broken_query")); - assertEquals("[range] time_zone can not be applied to non date field [text]", - rootCauses[0].getMessage()); + assertEquals("java.lang.NumberFormatException: For input string: \"noStringOnNumericFields\"", + rootCauses[0].getCause().toString()); }