Fix Highlighting usage integration test

Test used Unified highlighter, which is not available in Elasticsearch <5.3.0. There is a separate test for this.

Author: russcam

docs/search/request/highlighting-usage.asciidoc

@@ -37,6 +37,7 @@ s => s
 .Highlight(h => h
     .PreTags("<tag1>")
     .PostTags("</tag1>")
+    .Encoder("html")
     .Fields(
         fs => fs
             .Field(p => p.Name.Suffix("standard"))
@@ -52,6 +53,7 @@ s => s
             .PreTags("<name>")
             .PostTags("</name>")
             .BoundaryMaxScan(50)
+            .PhraseLimit(10)
             .HighlightQuery(q => q
                 .Match(m => m
                     .Field(p => p.LeadDeveloper.FirstName)
@@ -92,6 +94,7 @@ new SearchRequest<Project>
     {
         PreTags = new[] { "<tag1>" },
         PostTags = new[] { "</tag1>" },
+        Encoder = "html",
         Fields = new Dictionary<Field, IHighlightField>
         {
             { "name.standard", new HighlightField
@@ -107,6 +110,7 @@ new SearchRequest<Project>
             { "leadDeveloper.firstName", new HighlightField
                 {
                     Type = "fvh",
+                    PhraseLimit = 10,
                     BoundaryMaxScan = 50,
                     PreTags = new[] { "<name>"},
                     PostTags = new[] { "</name>"},
@@ -152,6 +156,7 @@ new SearchRequest<Project>
     "post_tags": [
       "</tag1>"
     ],
+    "encoder": "html",
     "fields": {
       "name.standard": {
         "type": "plain",
@@ -163,6 +168,7 @@ new SearchRequest<Project>
       },
       "leadDeveloper.firstName": {
         "type": "fvh",
+        "phrase_limit": 10,
         "boundary_max_scan": 50,
         "pre_tags": [
           "<name>"

src/Tests/Search/Request/HighlightingUsageTests.cs

@@ -23,7 +23,7 @@ public class HighlightingUsageTests : SearchUsageTestBase
 	{
 		public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
-		public string LastNameSearch { get; } = Project.First.LeadDeveloper.LastName;
+		public string LastNameSearch { get; } = Project.Instance.LeadDeveloper.LastName;
 
 		protected override object ExpectJson => new
 		{
@@ -77,20 +77,16 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 							}
 						}
 					},
-					{ "leadDeveloper.lastName", new Dictionary<string, object>
+					{ "state.offsets", new Dictionary<string, object>
 						{
-							{ "type", "unified" },
-							{ "pre_tags", new [] { "<name>" } },
-							{ "post_tags", new [] { "</name>" } },
+							{ "type", "postings" },
+							{ "pre_tags", new [] { "<state>" } },
+							{ "post_tags", new [] { "</state>" } },
 							{ "highlight_query", new Dictionary<string, object>
 								{
-									{ "match", new Dictionary<string, object>
+									{ "terms", new Dictionary<string, object>
 										{
-											{ "leadDeveloper.lastName", new Dictionary<string, object>
-												{
-													{ "query", LastNameSearch }
-												}
-											}
+											{ "state.offsets", new [] { "stable" , "bellyup" } }
 										}
 									}
 								}
@@ -135,14 +131,17 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 							)
 						),
 					fs => fs
-						.Field(p => p.LeadDeveloper.LastName)
-						.Type(HighlighterType.Unified)
-						.PreTags("<name>")
-						.PostTags("</name>")
+						.Field(p => p.State.Suffix("offsets"))
+						.Type(HighlighterType.Postings)
+						.PreTags("<state>")
+						.PostTags("</state>")
 						.HighlightQuery(q => q
-							.Match(m => m
-								.Field(p => p.LeadDeveloper.LastName)
-								.Query(LastNameSearch)
+							.Terms(t => t
+								.Field(f => f.State.Suffix("offsets"))
+								.Terms(
+									StateOfBeing.Stable.ToString().ToLowerInvariant(),
+									StateOfBeing.BellyUp.ToString().ToLowerInvariant()
+								)
 							)
 						)
 				)
@@ -187,15 +186,15 @@ public HighlightingUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 								}
 							}
 						},
-						{ "leadDeveloper.lastName", new HighlightField
+						{ "state.offsets", new HighlightField
 							{
-								Type = HighlighterType.Unified,
-								PreTags = new[] { "<name>"},
-								PostTags = new[] { "</name>"},
-								HighlightQuery = new MatchQuery
+								Type = HighlighterType.Postings,
+								PreTags = new[] { "<state>"},
+								PostTags = new[] { "</state>"},
+								HighlightQuery = new TermsQuery
 								{
-									Field = "leadDeveloper.lastName",
-									Query = LastNameSearch
+									Field = "state.offsets",
+									Terms = new [] { "stable", "bellyup" }
 								}
 							}
 						}