all yaml tests (including cat succeeding) for 1.0 generated client and yaml testS

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -16,8 +16,8 @@ namespace CodeGeneration.LowLevelClient
 {
 	public static class ApiGenerator
 	{
-		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/1.0/rest-api-spec/api";
-		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/1.0/rest-api-spec/api/";
+		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.0.0/rest-api-spec/api";
+		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.0.0/rest-api-spec/api/";
 		private readonly static string _nestFolder = @"..\..\..\..\..\src\Nest\";
 		private readonly static string _viewFolder = @"..\..\Views\";
 		private readonly static string _cacheFolder = @"..\..\Cache\";

src/CodeGeneration/CodeGeneration.LowLevelClient/Views/RawElasticClient.Generated.cshtml

@@ -45,7 +45,7 @@ namespace Nest
 		{
 		@foreach (ApiUrlPart part in method.Parts.Where(p=>p.Name != "body").ToList())
 		{
-			<text>@(part.Name).ThrowIfNull("@part.Name");</text>
+			<text>@(part.Name).@(part.Type == "string" || part.Type == "list" ? "ThrowIfNullOrEmpty" : "ThrowIfNull")("@part.Name");</text>
 		}
 		@if (method.Parts.Any())
 		{

src/CodeGeneration/CodeGeneration.YamlTestsRunner/Domain/DoStep.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using CsQuery.ExtensionMethods.Internal;
 
 namespace CodeGeneration.YamlTestsRunner.Domain
 {
@@ -64,13 +65,13 @@ private void PatchCall()
 					this.QueryString = new Dictionary<string, object>();
 				this.QueryString.Add("op_type", "create");
 			}
-			else if (
-				this.Call == "indices.delete_alias"
+			else if (!this.Catch.IsNullOrEmpty() &&
+				(this.Call == "indices.delete_alias"
 				|| this.Call == "indices.delete_warmer"
 				|| this.Call == "indices.delete_mapping"
 				|| this.Call == "indices.put_alias"
 				|| this.Call == "indices.put_warmer"
-				|| this.Call == "indices.put_mapping")
+				|| this.Call == "indices.put_mapping"))
 			{
 				Func<string, bool> m = (s) => Regex.IsMatch(this.TestDescription, "(blank|empty|missing) " + s);
 
@@ -172,16 +173,6 @@ private IEnumerable<string> CsharpArguments(string call, bool inverse = false)
 				.Select(ki => ki.Key);
 			return csharpArguments.ToList();
 		}
-		private int MethodPreference(string method)
-		{
-			var postBoost = this.Body != null ? 10 : 0;
-			var getBoost = this.Body == null ? 10 : 0;
-
-			//if (method.Contains("Post(")) return 5 + postBoost;
-			//if (method.Contains("Put(")) return 4 + postBoost;
-			//if (method.Contains("Get(")) return 3 + getBoost;
-			//if (method.Contains("Head(")) return 2 + postBoost;
-			return 0;
-		}
+	
 	}
 }

src/CodeGeneration/CodeGeneration.YamlTestsRunner/Domain/TestSuite.cs

@@ -141,7 +141,7 @@ private static string PropertyPath(string value)
 				value = value.Replace(@"\.", "|||");
 				value = Regex.Replace(value, @"\.([^\.]+)", m => "[" + m.Value.Trim('.').SurroundWithQuotes() + "]");
 				value = value.Replace("|||", ".");
-				return "_responseDictionary" + value;
+				return "_response" + value;
 			}
 			return "_response" + value;
 		}

src/CodeGeneration/CodeGeneration.YamlTestsRunner/Extensions.cs

@@ -110,7 +110,12 @@ public static string SerializeToAnonymousObject(this object o, string indentatio
 			serializer.Serialize(writer, o);
 			writer.Close();
 			//anonymousify the json
-			var anon = stringWriter.ToString().Replace("{", "new {").Replace("]", "}").Replace("[", "new [] {").Replace(":", "=");
+			var anon = stringWriter.ToString()
+				.Replace("{", "new {")
+				.Replace("]", "}")
+				.Replace("[", "new [] {")
+				.Replace(":", "=")
+				.Replace("http=", "http:");
 			//match indentation of the view	
 			anon = Regex.Replace(anon, @"^(\s+)?", (m) =>
 			{

src/CodeGeneration/CodeGeneration.YamlTestsRunner/YamlTestsGenerator.cs

@@ -24,8 +24,8 @@ namespace CodeGeneration.YamlTestsRunner
 	using YamlTestSuite = Dictionary<string, object>;
 	public static class YamlTestsGenerator
 	{
-		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/1.0/rest-api-spec/test";
-		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/1.0/rest-api-spec/test/";
+		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.0.0/rest-api-spec/test";
+		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.0.0/rest-api-spec/test/";
 		private readonly static string _testProjectFolder = @"..\..\..\..\..\src\Tests\Nest.Tests.Integration.Yaml\";
 		private readonly static string _rawClientInterface = @"..\..\..\..\..\src\Nest\IRawElasticClient.generated.cs";
 		private readonly static string _viewFolder = @"..\..\Views\";
@@ -128,13 +128,14 @@ private static void PatchDefinition(YamlDefinition yamlDefinition, string folder
 			if (file == "20_fields_pre_0.90.3.yaml")
 				yamlDefinition.Suites.First().Description = "Fields Pre 0.90.3";
 
-			var setupRoutine = yamlDefinition.Suites.FirstOrDefault(s => s.Description == "setup");
+			var setupRoutine = yamlDefinition.Suites
+				.FirstOrDefault(s => s.Description.Contains("setup"));
 			if (setupRoutine != null)
 			{
 				yamlDefinition.SetupSuite = setupRoutine;
 				foreach (var suite in yamlDefinition.Suites)
 					suite.HasSetup = true;
-				yamlDefinition.Suites = yamlDefinition.Suites.Where(s => s.Description != "setup");
+				yamlDefinition.Suites = yamlDefinition.Suites.Where(s => !s.Description.Contains("setup"));
 			}
 		}
 

src/Nest.Connection.Thrift/ThriftConnection.cs

@@ -263,7 +263,7 @@ private ConnectionStatus Execute(RestRequest restRequest)
 
 					var result = client.execute(restRequest);
 					if (result.Status == Status.OK || result.Status == Status.CREATED || result.Status == Status.ACCEPTED)
-						return new ConnectionStatus(this._connectionSettings, DecodeStr(result.Body));
+						return new ConnectionStatus(this._connectionSettings, result.Body);
 					else
 					{
 						var connectionException = new ConnectionException(

src/Nest/DSL/_Descriptors.generated.cs

@@ -6,7 +6,7 @@
 using Nest.Resolvers;
 ///This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-///Generated of commit 7f80a0b723
+///Generated of commit 
 
 namespace Nest
 {

src/Nest/Domain/Connection/AsyncRequestOperation.cs

@@ -161,9 +161,11 @@ protected virtual HttpWebRequest CreateWebRequest(string path, string method)
 			var url = this._CreateUriString(path);
 
 			var myReq = (HttpWebRequest)WebRequest.Create(url);
-			myReq.Accept = "application/json";
-			myReq.ContentType = "application/json";
-
+			if (!path.StartsWith("_cat"))
+			{
+				myReq.Accept = "application/json";
+				myReq.ContentType = "application/json";
+			}
 			var timeout = this._ConnectionSettings.Timeout;
 			myReq.Timeout = timeout; // 1 minute timeout.
 			myReq.ReadWriteTimeout = timeout; // 1 minute timeout.
@@ -188,10 +190,10 @@ protected virtual ConnectionStatus DoSynchronousRequest(HttpWebRequest request,
 				{
 					using (var response = (HttpWebResponse)request.GetResponse())
 					using (var responseStream = response.GetResponseStream())
-					using (var streamReader = new StreamReader(responseStream))
+					using (var memoryStream = new MemoryStream())
 					{
-						var result = streamReader.ReadToEnd();
-						cs = new ConnectionStatus(this._ConnectionSettings, result)
+						responseStream.CopyTo(memoryStream);
+						cs = new ConnectionStatus(this._ConnectionSettings, memoryStream.ToArray())
 						{
 							Request = requestData,
 							RequestUrl = request.RequestUri.ToString(),
@@ -288,21 +290,20 @@ private IEnumerable<Task> _AsyncSteps(HttpWebRequest request, TaskCompletionSour
 				// Get the response stream
 				using (var response = (HttpWebResponse)getResponse.Result)
 				using (var responseStream = response.GetResponseStream())
+				using (var memoryStream = new MemoryStream())
 				{
 					// Copy all data from the response stream
-					var output = new MemoryStream();
 					var buffer = new byte[BUFFER_SIZE];
 					while (responseStream != null)
 					{
 						var read = Task<int>.Factory.FromAsync(responseStream.BeginRead, responseStream.EndRead, buffer, 0, BUFFER_SIZE, null);
 						yield return read;
 						if (read.Result == 0) break;
-						output.Write(buffer, 0, read.Result);
+						memoryStream.Write(buffer, 0, read.Result);
 					}
 
 					// Decode the data and store the result
-					var result = output.ToArray().Utf8String();
-					var cs = new ConnectionStatus(this._ConnectionSettings, result)
+					var cs = new ConnectionStatus(this._ConnectionSettings, memoryStream.ToArray())
 					{
 						Request = data.Utf8String(),
 						RequestUrl = request.RequestUri.ToString(), 
@@ -312,9 +313,7 @@ private IEnumerable<Task> _AsyncSteps(HttpWebRequest request, TaskCompletionSour
 					tracer.SetResult(cs);
 					_ConnectionSettings.ConnectionStatusHandler(cs);
 				}
-				yield break;
 			}
-
 		}
 
 		public void Iterate(IEnumerable<Task> asyncIterator, TaskCompletionSource<ConnectionStatus> tcs)