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

Conflicts:
	src/Nest.Tests.Unit/Search/Sort/SortTests.cs

Author: Mpdreamz

src/Nest.Tests.Integration/Cluster/StateTests.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace Nest.Tests.Integration.Cluster
+{
+	[TestFixture]
+	public class StateTests : IntegrationTests
+	{
+		[Test]
+		public void SimpleState()
+		{
+			var r = this._client.ClusterState(ClusterStateInfo.All);
+			Assert.True(r.IsValid);
+			Assert.NotNull(r.ClusterName);
+			Assert.NotNull(r.MasterNode);
+            Assert.NotNull(r.Metadata);
+            Assert.NotNull(r.Metadata.Indices);
+            Assert.True(r.Metadata.Indices.Count > 0);
+            Assert.NotNull(r.Nodes);
+            Assert.True(r.Nodes.Count > 0);
+            Assert.NotNull(r.RoutingNodes);
+            Assert.True(r.RoutingNodes.Nodes.Count > 0);
+            Assert.NotNull(r.RoutingTable);
+		}
+		[Test]
+		public void StateWithoutMetadata()
+		{
+			var r = this._client.ClusterState(ClusterStateInfo.ExcludeMetadata);
+            Assert.IsNull(r.Metadata);
+		}
+        [Test]
+        public void StateWithoutNodes()
+        {
+            var r = this._client.ClusterState(ClusterStateInfo.ExcludeNodes);
+            Assert.IsNull(r.Nodes);
+        }
+        [Test]
+        public void StateWithoutRoutingTable()
+        {
+            var r = this._client.ClusterState(ClusterStateInfo.ExcludeRoutingTable);
+            Assert.IsNull(r.RoutingTable);
+        }
+        //[Test]
+        //public void StateWithoutBlocks()
+        //{
+        //    var r = this._client.ClusterState(ClusterStateInfo.ExcludeRoutingTable);
+        //    Assert.IsNull(r.Blocks);
+        //}
+	}
+}

src/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Indices\Analysis\Analyzers\AnalyzerTest.cs" />
     <Compile Include="Indices\Analysis\Analyzers\AnalyzerTestResult.cs" />
     <Compile Include="Indices\Analysis\Analyzers\AnalyzerTests.cs" />
+    <Compile Include="Cluster\StateTests.cs" />
     <Compile Include="IntegrationTests.cs" />
     <Compile Include="Cluster\HealthTests.cs" />
     <Compile Include="Cluster\NodeTests.cs" />