diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java index ee68ea6003..ac3c82749d 100644 --- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java @@ -40,7 +40,6 @@ import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.rescore.QueryRescorer.QueryRescoreContext; @@ -118,9 +117,8 @@ public class QueryRescoreBuilderTests extends ESTestCase { XContentParser parser = createParser(shuffled); - QueryParseContext context = new QueryParseContext(parser); parser.nextToken(); - RescoreBuilder<?> secondRescoreBuilder = RescoreBuilder.parseFromXContent(context); + RescoreBuilder<?> secondRescoreBuilder = RescoreBuilder.parseFromXContent(parser); assertNotSame(rescoreBuilder, secondRescoreBuilder); assertEquals(rescoreBuilder, secondRescoreBuilder); assertEquals(rescoreBuilder.hashCode(), secondRescoreBuilder.hashCode()); @@ -174,9 +172,9 @@ public class QueryRescoreBuilderTests extends ESTestCase { " \"window_size\" : 20,\n" + " \"bad_rescorer_name\" : { }\n" + "}\n"; - QueryParseContext context = createContext(rescoreElement); + XContentParser parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (ParsingException e) { assertEquals("rescore doesn't support rescorer with name [bad_rescorer_name]", e.getMessage()); @@ -185,9 +183,9 @@ public class QueryRescoreBuilderTests extends ESTestCase { rescoreElement = "{\n" + " \"bad_fieldName\" : 20\n" + "}\n"; - context = createContext(rescoreElement); + parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (ParsingException e) { assertEquals("rescore doesn't support [bad_fieldName]", e.getMessage()); @@ -197,18 +195,18 @@ public class QueryRescoreBuilderTests extends ESTestCase { " \"window_size\" : 20,\n" + " \"query\" : [ ]\n" + "}\n"; - context = createContext(rescoreElement); + parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (ParsingException e) { assertEquals("unexpected token [START_ARRAY] after [query]", e.getMessage()); } rescoreElement = "{ }"; - context = createContext(rescoreElement); + parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (ParsingException e) { assertEquals("missing rescore type", e.getMessage()); @@ -218,9 +216,9 @@ public class QueryRescoreBuilderTests extends ESTestCase { " \"window_size\" : 20,\n" + " \"query\" : { \"bad_fieldname\" : 1.0 } \n" + "}\n"; - context = createContext(rescoreElement); + parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (IllegalArgumentException e) { assertEquals("[query] unknown field [bad_fieldname], parser not found", e.getMessage()); @@ -230,9 +228,9 @@ public class QueryRescoreBuilderTests extends ESTestCase { " \"window_size\" : 20,\n" + " \"query\" : { \"rescore_query\" : { \"unknown_queryname\" : { } } } \n" + "}\n"; - context = createContext(rescoreElement); + parser = createParser(rescoreElement); try { - RescoreBuilder.parseFromXContent(context); + RescoreBuilder.parseFromXContent(parser); fail("expected a parsing exception"); } catch (ParsingException e) { assertEquals("[query] failed to parse field [rescore_query]", e.getMessage()); @@ -242,19 +240,18 @@ public class QueryRescoreBuilderTests extends ESTestCase { " \"window_size\" : 20,\n" + " \"query\" : { \"rescore_query\" : { \"match_all\" : { } } } \n" + "}\n"; - context = createContext(rescoreElement); - RescoreBuilder.parseFromXContent(context); + parser = createParser(rescoreElement); + RescoreBuilder.parseFromXContent(parser); } /** * create a new parser from the rescorer string representation and reset context with it */ - private QueryParseContext createContext(String rescoreElement) throws IOException { + private XContentParser createParser(String rescoreElement) throws IOException { XContentParser parser = createParser(JsonXContent.jsonXContent, rescoreElement); - QueryParseContext context = new QueryParseContext(parser); // move to first token, this is where the internal fromXContent assertTrue(parser.nextToken() == XContentParser.Token.START_OBJECT); - return context; + return parser; } @Override |