Merge remote-tracking branch 'origin/master'

Author: Moran

src/HackerNews.Indexer/Program.cs

@@ -1,25 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using HackerNews.Indexer.Domain;
-using Nest;
-using System.Diagnostics;
-using System.Net;
-using System.Threading.Tasks;
-using System.Threading;
-
-namespace HackerNews.Indexer
-{
-	class Program
-	{
-		/// <summary>
-		/// Depends on hn_full_11-07-2010.xml which you can download from: 
-		/// http://api.ihackernews.com/torrents/hn_full_11-07-2010.zip.torrent
-		/// 
-		/// When run from debug make sure to change the default debug arguments.
-		/// <param name="args">Full filepath to hn_full_11-07-2010.xml</param>
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using HackerNews.Indexer.Domain;
+using Nest;
+using System.Diagnostics;
+using System.Net;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace HackerNews.Indexer
+{
+	class Program
+	{
+		/// <summary>
+		/// Depends on hn_full_11-07-2010.xml which you can download from: 
+		/// http://api.ihackernews.com/torrents/hn_full_11-07-2010.zip.torrent
+		/// 
+		/// When run from debug make sure to change the default debug arguments.
+		/// <param name="args">Full filepath to hn_full_11-07-2010.xml</param>
 		static void Main(string[] args)
 		{
 			var filePath = args.First();
@@ -34,7 +34,7 @@ static void Main(string[] args)
 					elasticSettings.Host, connectionStatus.Error.OriginalException.Message);
 				Console.Read();
 				return;
-			}
+			}
 
 
 			var reader = new XmlTextReader(filePath);
@@ -126,6 +126,6 @@ static void Main(string[] args)
 			}
 
 
-		}
-	}
-}
+		}
+	}
+}

src/Nest.Connection.Thrift/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -21,7 +21,7 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("4d165338-2060-4641-8be6-b7aacbdee52d")]
-[assembly: AssemblyVersion("0.9.9.0")]
-[assembly: AssemblyFileVersion("0.9.9.0")]
+[assembly: AssemblyVersion("0.9.12.0")]
+[assembly: AssemblyFileVersion("0.9.12.0")]
 
 

src/Nest.Tests.Integration/Core/DeleteTests.cs

@@ -10,24 +10,8 @@ namespace Nest.Tests.Integration.Core
 	[TestFixture]
 	public class DeleteTests : BaseElasticSearchTests
 	{
-		[Test]
-		public void HitsMaxScoreIsSet()
-		{
-			//arrange
-			//pull existing example through method we know is functional based on other passing unit tests
-			var queryResults = this.ConnectedClient.SearchRaw<ElasticSearchProject>(
-				@" { ""query"" : {
-						 ""query_string"" : {
-							""query"" : ""*""
-						}
-					} }"
-			);
-
-			var hits = queryResults.Hits;
-
-			Assert.AreEqual(1, hits.MaxScore);
-			Assert.AreEqual(hits.Hits.Max(h => h.Score), hits.MaxScore);
-		}
+		
+		
 		[Test]
 		public void ShouldThowOnNullId()
 		{

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

@@ -40,6 +40,52 @@ public void BogusQuery()
 			Assert.NotNull(error);
 			Assert.True(error.HttpStatusCode == System.Net.HttpStatusCode.InternalServerError);
 		}
+
+		[Test]
+		public void HitsMaxScoreIsSet()
+		{
+			//arrange
+			//pull existing example through method we know is functional based on other passing unit tests
+			var queryResults = this.ConnectedClient.Search<ElasticSearchProject>(s => s
+				.QueryString("*")
+				//.SortAscending(p => p.Id)
+			);
+
+			var hits = queryResults.Hits;
+
+			Assert.AreEqual(1, hits.MaxScore);
+			Assert.AreEqual(hits.Hits.Max(h => h.Score), hits.MaxScore);
+		}
+
+		[Test]
+		public void HitsSortsIsSet()
+		{
+			//arrange
+			//pull existing example through method we know is functional based on other passing unit tests
+			var queryResults = this.ConnectedClient.Search<ElasticSearchProject>(s => s
+				.QueryString("*")
+				.SortAscending("_score")
+				.SortDescending(p=>p.Id)
+			);
+
+			var hits = queryResults.Hits;
+
+			Assert.True(hits.Hits.All(h=>h.Sorts.Count() == 2));
+		}
+		[Test]
+		public void HitsSortsIsSetWithStringSort()
+		{
+			var queryResults = this.ConnectedClient.Search<ElasticSearchProject>(s => s
+				.QueryString("*")
+				.SortAscending(p=>p.Name.Suffix("sort"))
+				.SortDescending(p => p.Id)
+			);
+
+			var hits = queryResults.Hits;
+
+			Assert.True(hits.Hits.All(h => h.Sorts.Count() == 2));
+		}
+
 		[Test]
 		public void BoolQuery()
 		{

src/Nest.Tests.Integration/Test.Designer.cs

@@ -15,7 +15,7 @@
       <Value Profile="(Default)">localhost</Value>
     </Setting>
     <Setting Name="Uri" Type="System.Uri" Scope="User">
-      <Value Profile="(Default)">http://127.0.0.1:9200</Value>
+      <Value Profile="(Default)">http://127.0.0.1.:9200</Value>
     </Setting>
   </Settings>
 </SettingsFile>

src/Nest.Tests.Integration/Test.settings

@@ -34,7 +34,7 @@
                 <value>localhost</value>
             </setting>
             <setting name="Uri" serializeAs="String">
-                <value>http://127.0.0.1:9200</value>
+                <value>http://127.0.0.1.:9200</value>
             </setting>
         </Nest.Tests.Integration.Test>
     </userSettings>