diff options
Diffstat (limited to 'modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java')
| -rw-r--r-- | modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java b/modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java index 41242a693d..7bff3f5984 100644 --- a/modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java +++ b/modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/TemplateQueryBuilderTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.script.mustache; import org.apache.lucene.index.memory.MemoryIndex; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -50,6 +49,8 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import static org.hamcrest.Matchers.containsString; + public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQueryBuilder> { /** @@ -114,7 +115,7 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue @Override protected TemplateQueryBuilder doCreateTestQueryBuilder() { - return new TemplateQueryBuilder(new Script(templateBase.toString(), ScriptType.INLINE, "mustache", null, null)); + return new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mustache", templateBase.toString(), Collections.emptyMap())); } @Override @@ -138,9 +139,9 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue String queryAsString = testQueryAsString.replace("inline", "bogusField"); try { parseQuery(queryAsString); - fail("ScriptParseException expected."); - } catch (ElasticsearchParseException e) { - assertTrue(e.getMessage().contains("bogusField")); + fail("IllegalArgumentException expected"); + } catch (IllegalArgumentException e) { + assertThat(e.getMessage(), containsString("[script] unknown field [bogusField], parser not found")); } } @@ -178,8 +179,8 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue @Override public void testMustRewrite() throws IOException { String query = "{ \"match_all\" : {}}"; - QueryBuilder builder = new TemplateQueryBuilder(new Script(query, ScriptType.INLINE, "mockscript", - Collections.emptyMap(), XContentType.JSON)); + QueryBuilder builder = new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mockscript", query, + Collections.singletonMap(Script.CONTENT_TYPE_OPTION, XContentType.JSON.mediaType()), Collections.emptyMap())); try { builder.toQuery(createShardContext()); fail(); @@ -191,24 +192,24 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue public void testRewriteWithInnerName() throws IOException { final String query = "{ \"match_all\" : {\"_name\" : \"foobar\"}}"; - QueryBuilder builder = new TemplateQueryBuilder(new Script(query, ScriptType.INLINE, "mockscript", - Collections.emptyMap(), XContentType.JSON)); + QueryBuilder builder = new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mockscript", query, + Collections.singletonMap(Script.CONTENT_TYPE_OPTION, XContentType.JSON.mediaType()), Collections.emptyMap())); assertEquals(new MatchAllQueryBuilder().queryName("foobar"), builder.rewrite(createShardContext())); - builder = new TemplateQueryBuilder(new Script(query, ScriptType.INLINE, "mockscript", - Collections.emptyMap(), XContentType.JSON)).queryName("outer"); + builder = new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mockscript", query, Collections.singletonMap( + Script.CONTENT_TYPE_OPTION, XContentType.JSON.mediaType()), Collections.emptyMap())).queryName("outer"); assertEquals(new BoolQueryBuilder().must(new MatchAllQueryBuilder().queryName("foobar")).queryName("outer"), builder.rewrite(createShardContext())); } public void testRewriteWithInnerBoost() throws IOException { final TermQueryBuilder query = new TermQueryBuilder("foo", "bar").boost(2); - QueryBuilder builder = new TemplateQueryBuilder(new Script(query.toString(), ScriptType.INLINE, "mockscript", - Collections.emptyMap(), XContentType.JSON)); + QueryBuilder builder = new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mockscript", query.toString(), + Collections.singletonMap(Script.CONTENT_TYPE_OPTION, XContentType.JSON.mediaType()), Collections.emptyMap())); assertEquals(query, builder.rewrite(createShardContext())); - builder = new TemplateQueryBuilder(new Script(query.toString(), ScriptType.INLINE, "mockscript", - Collections.emptyMap(), XContentType.JSON)).boost(3); + builder = new TemplateQueryBuilder(new Script(ScriptType.INLINE, "mockscript", query.toString(), + Collections.singletonMap(Script.CONTENT_TYPE_OPTION, XContentType.JSON.mediaType()), Collections.emptyMap())).boost(3); assertEquals(new BoolQueryBuilder().must(query).boost(3), builder.rewrite(createShardContext())); } |