added tests cases

Author: piergm

server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java

@@ -3539,6 +3539,44 @@ public void testConstantKeywordFieldNoHighlightingQueryString() throws IOExcepti
         assertHitCount(search, 0);
     }
 
+    public void testConstantKeywordFieldHighlightingSimpleQueryString() throws IOException {
+        String index = "test";
+        String constantKeywordFieldName = "test_constant_keyword_field";
+        String constantValue = "constant_value";
+
+        XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
+        assertAcked(prepareCreate(index).setMapping(mappings));
+
+        XContentBuilder document = jsonBuilder().startObject()
+            .field("foo", "bar")
+            .field(constantKeywordFieldName, constantValue)
+            .endObject();
+        saveDocumentIntoIndex(index, "1", document);
+
+        SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.simpleQueryStringQuery(constantValue));
+
+        assertNoFailures(search);
+        assertHighlight(search, 0, constantKeywordFieldName, 0, 1, equalTo("<em>constant_value</em>"));
+    }
+
+    public void testConstantKeywordFieldNoHighlightingSimpleQueryString() throws IOException {
+        String index = "test";
+        String constantKeywordFieldName = "test_constant_keyword_field";
+        String constantValue = "constant_value";
+        String queryString = "foobar";
+
+        XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
+        assertAcked(prepareCreate(index).setMapping(mappings));
+
+        XContentBuilder document = jsonBuilder().startObject().field("foo", "bar").endObject();
+        saveDocumentIntoIndex(index, "1", document);
+
+        SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.simpleQueryStringQuery(queryString));
+
+        assertNoFailures(search);
+        assertHitCount(search, 0);
+    }
+
     public void testConstantKeywordFieldHighlightingTerm() throws IOException {
         String index = "test";
         String constantKeywordFieldName = "test_constant_keyword_field";

server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java

@@ -9,8 +9,10 @@
 package org.elasticsearch.index.query;
 
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.WildcardQuery;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.Strings;
@@ -600,4 +602,9 @@ protected boolean doEquals(SimpleQueryStringBuilder other) {
     public TransportVersion getMinimalSupportedVersion() {
         return TransportVersion.ZERO;
     }
+
+    @Override
+    public Query toHighlightQuery(String fieldName) {
+        return new WildcardQuery(new Term(fieldName, queryText));
+    }
 }