Merge branch 'master' of github.com:MaxHorstmann/NEST

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

Author: Mpdreamz

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

@@ -174,6 +174,29 @@ public void TermSuggest()
 			Assert.AreEqual(results.Suggest["mySuggest"].First().Options.First().Text, country);
         }
 
+        [Test]
+        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"))
+            );
+
+            Assert.NotNull(results);
+            Assert.True(results.IsValid);
+
+            Assert.NotNull(results.Suggest);
+            Assert.NotNull(results.Suggest.Values);
+
+            Assert.AreEqual(results.Suggest.Values.Count, 1);
+            Assert.AreEqual(results.Suggest.Values.First().Count(), 1);
+
+            Assert.NotNull(results.Suggest.Values.First().First().Options);
+            Assert.GreaterOrEqual(results.Suggest.Values.First().First().Options.Count(), 1);
+
+            Assert.AreEqual(results.Suggest.Values.First().First().Options.First().Text, "nostrud frankfurter deserunt ulalmco");
+        }
+
         [Test]
         public void TestCustomFiltersScore()
         {

src/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -215,6 +215,7 @@
     <Compile Include="Search\SearchType\ScriptFieldTests.cs" />
     <Compile Include="Internals\Serialize\SerializeTests.cs" />
     <Compile Include="Search\Sort\SortTests.cs" />
+    <Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
     <Compile Include="Search\Suggest\TermSuggestTests.cs" />
     <Compile Include="Settings\UsePrettyResponseTests.cs" />
     <Compile Include="Test.Designer.cs">

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

@@ -0,0 +1,57 @@
+using NUnit.Framework;
+using Nest.Tests.MockData.Domain;
+
+namespace Nest.Tests.Unit.Search.Suggest
+{
+	[TestFixture]
+	public class PhraseSuggestTests : BaseJsonTests
+	{
+		[Test]
+        public void PhraseSuggestDescriptorTest()
+		{
+		    var phraseSuggestDescriptor = new PhraseSuggestDescriptor<ElasticSearchProject>()
+		        .Analyzer("body")
+		        .OnField("bigram")
+		        .Size(1)
+		        .MaxErrors(0.5m)
+		        .GramSize(2);
+
+            var json = TestElasticClient.Serialize(phraseSuggestDescriptor);
+
+            var expected = @"{
+                              ""gram_size"": 2,
+                              ""max_errors"": 0.5,
+                              ""field"": ""bigram"",
+                              ""analyzer"": ""body"",
+                              ""size"": 1
+                            }";
+
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
+        [Test]
+        public void PhraseSuggestDescriptorDirectGeneratorTest()
+        {
+            var phraseSuggestDescriptor = new PhraseSuggestDescriptor<ElasticSearchProject>()
+                .Analyzer("body")
+                .DirectGenerator(m => m.OnField("body").SuggestMode(SuggestMode.Always).MinWordLength(3));
+
+            var json = TestElasticClient.Serialize(phraseSuggestDescriptor);
+
+            var expected = @"{
+                              ""direct_generator"": [
+                                {
+                                  ""field"": ""body"",
+                                  ""suggest_mode"": ""always"",
+                                  ""min_word_len"": 3
+                                }
+                              ],
+                              ""analyzer"": ""body""
+                            }";
+
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
+
+	} 
+}

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

@@ -1,26 +1,37 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Unit.Search.Query.Bool
+namespace Nest.Tests.Unit.Search.Suggest
 {
+
 	[TestFixture]
 	public class TermSuggestTests : BaseJsonTests
 	{
 		[Test]
         public void TermSuggestDescriptorTest()
 		{
-		    var termSuggestDescriptor = new TermSuggestDescriptor<ElasticSearchProject>().MaxEdits(3).MaxInspections(17).OnField("field1");
+		    var termSuggestDescriptor = new TermSuggestDescriptor<ElasticSearchProject>()
+		        .MaxEdits(3)
+		        .MaxInspections(17)
+		        .OnField("field1")
+		        .Size(3)
+		        .SuggestMode(SuggestMode.Missing);
+
             var json = TestElasticClient.Serialize(termSuggestDescriptor);
 
             var expected = @"{
+                              ""suggest_mode"": ""missing"",
                               ""max_edits"": 3,
                               ""max_inspections"": 17,
-                              ""field"": ""field1""
+                              ""field"": ""field1"",
+                              ""size"": 3
                             }";
 
             Assert.True(json.JsonEquals(expected), json);
         }
 
 
+
+
 	} 
 }