added a few more unit tests to all the awesome new suggest stuff

Author: Mpdreamz

src/Nest.Tests.Integration/Search/QueryDSLTests.cs

@@ -154,7 +154,7 @@ public void TermSuggest()
 
             var results = this._client.Search<ElasticSearchProject>(s => s
                 .Query(q => q.MatchAll())
-				.TermSuggest("mySuggest", m => m.SuggestMode(SuggestMode.Always).Text(wrongCountry).Size(1).OnField("country"))
+				.SuggestTerm("mySuggest", m => m.SuggestMode(SuggestMode.Always).Text(wrongCountry).Size(1).OnField("country"))
             );
 
             Assert.NotNull(results);
@@ -179,7 +179,7 @@ public void PhraseSuggest()
         {
             var results = this._client.Search<ElasticSearchProject>(s => s
                 .Query(q => q.MatchAll())
-                .PhraseSuggest("myPhraseSuggest", m => m.Text("Nostrud frankufrter dseerunt ulalmco").Size(1).OnField("content"))
+                .SuggestPhrase("myPhraseSuggest", m => m.Text("Nostrud frankufrter dseerunt ulalmco").Size(1).OnField("content"))
             );
 
             Assert.NotNull(results);

src/Nest.Tests.Unit/Search/suggest/PhraseSuggestTests.cs

@@ -52,6 +52,36 @@ public void PhraseSuggestDescriptorDirectGeneratorTest()
             Assert.True(json.JsonEquals(expected), json);
         }
 
+		[Test]
+		public void PhraseSuggestOnSearchTest()
+		{
+			var search = this._client.Search<ElasticSearchProject>(s => s
+				.SuggestPhrase("myphrasesuggest", ts => ts
+					.Text("n")
+					.Analyzer("body")
+					.OnField("bigram")
+					.Size(1)
+					.MaxErrors(0.5m)
+					.GramSize(2)
+				)
+			);
 
+			var expected = @"{
+				suggest: {
+					myphrasesuggest: {
+						text: ""n"",
+						phrase: {
+							  ""gram_size"": 2,
+                              ""max_errors"": 0.5,
+                              ""field"": ""bigram"",
+                              ""analyzer"": ""body"",
+                              ""size"": 1
+						}
+					}
+				}
+			}";
+			var json = search.ConnectionStatus.Request;
+			Assert.True(json.JsonEquals(expected), json);
+		}
 	} 
 }

src/Nest.Tests.Unit/Search/suggest/TermSuggestTests.cs

@@ -30,7 +30,38 @@ public void TermSuggestDescriptorTest()
             Assert.True(json.JsonEquals(expected), json);
         }
 
+		[Test]
+		public void TermSuggestOnSearchTest()
+		{
+			var search = this._client.Search<ElasticSearchProject>(s => s
+				.SuggestTerm("mytermsuggest", ts=>ts
+					.Text("n")
+					.MaxEdits(3)
+					.MaxInspections(17)
+					.OnField("field1")
+					.Size(3)
+					.SuggestMode(SuggestMode.Missing)
+				)
+			);
+
+			var expected = @"{
+				suggest: {
+					mytermsuggest: {
+						text: ""n"",
+						term: {
+							suggest_mode: ""missing"",
+							max_edits: 3,
+							max_inspections: 17,
+							field: ""field1"",
+							size: 3
 
+						}
+					}
+				}
+			}";
+			var json = search.ConnectionStatus.Request;
+			Assert.True(json.JsonEquals(expected), json);
+		}
 
 
 	} 

src/Nest/DSL/SearchDescriptor.cs

@@ -877,41 +877,43 @@ public SearchDescriptor<T> FacetFilter(string name, Func<FilterDescriptor<T>, Ba
 			return this;
 		}
 
-		public SearchDescriptor<T> TermSuggest(string name, Func<TermSuggestDescriptor<T>, TermSuggestDescriptor<T>> suggest)
+		public SearchDescriptor<T> SuggestTerm(string name, Func<TermSuggestDescriptor<T>, TermSuggestDescriptor<T>> suggest)
 		{
 			name.ThrowIfNullOrEmpty("name");
 			suggest.ThrowIfNull("suggest");
 			if (this._Suggest == null)
 				this._Suggest = new Dictionary<string, SuggestDescriptorBucket<T>>();
-			TermSuggestDescriptor<T> desc = new TermSuggestDescriptor<T>();
-			TermSuggestDescriptor<T> item = suggest(desc);
-			SuggestDescriptorBucket<T> bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, TermSuggest = item };
+			var desc = new TermSuggestDescriptor<T>();
+			var item = suggest(desc);
+			var bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, TermSuggest = item };
 			this._Suggest.Add(name, bucket);
 			return this;
 		}
 
-		public SearchDescriptor<T> PhraseSuggest(string name, Func<PhraseSuggestDescriptor<T>, PhraseSuggestDescriptor<T>> suggest)
+		public SearchDescriptor<T> SuggestPhrase(string name, Func<PhraseSuggestDescriptor<T>, PhraseSuggestDescriptor<T>> suggest)
 		{
 			name.ThrowIfNullOrEmpty("name");
 			suggest.ThrowIfNull("suggest");
 			if (this._Suggest == null)
 				this._Suggest = new Dictionary<string, SuggestDescriptorBucket<T>>();
-			PhraseSuggestDescriptor<T> desc = new PhraseSuggestDescriptor<T>();
-			PhraseSuggestDescriptor<T> item = suggest(desc);
-			SuggestDescriptorBucket<T> bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, PhraseSuggest = item };
+
+			var desc = new PhraseSuggestDescriptor<T>();
+			var item = suggest(desc);
+			var bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, PhraseSuggest = item };
 			this._Suggest.Add(name, bucket);
 			return this;
 		}
 
-		public SearchDescriptor<T> CompletionSuggest(string name, Func<CompletionSuggestDescriptor<T>, CompletionSuggestDescriptor<T>> suggest)
+		public SearchDescriptor<T> SuggestCompletion(string name, Func<CompletionSuggestDescriptor<T>, CompletionSuggestDescriptor<T>> suggest)
 		{
 			name.ThrowIfNullOrEmpty("name");
 			suggest.ThrowIfNull("suggest");
 			if (this._Suggest == null)
-				this._Suggest = new Dictionary<String, SuggestDescriptorBucket<T>>();
-			CompletionSuggestDescriptor<T> desc = new CompletionSuggestDescriptor<T>();
-			CompletionSuggestDescriptor<T> item = suggest(desc);
-			SuggestDescriptorBucket<T> bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, CompletionSuggest = item };
+				this._Suggest = new Dictionary<string, SuggestDescriptorBucket<T>>();
+
+			var desc = new CompletionSuggestDescriptor<T>();
+			var item = suggest(desc);
+			var bucket = new SuggestDescriptorBucket<T> { _Text = item._Text, CompletionSuggest = item };
 			this._Suggest.Add(name, bucket);
 			return this;
 		}