fixed failing unit tests due to reworked internals

Author: Mpdreamz

src/Elasticsearch.Net.Tests.Unit/Connection/ConcurrencyTests.cs

@@ -117,7 +117,8 @@ public class ConcurrencyTestConnection : InMemoryConnection
 				new Uri("http://localhost:9206"),
 			};
 			private readonly Random _rnd = new Random();
-			public ConcurrencyTestConnection(IConnectionConfigurationValues settings) : base(settings)
+			public ConcurrencyTestConnection(IConnectionConfigurationValues settings) 
+				: base(settings)
 			{
 			}
 

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -369,23 +369,7 @@ public void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> async
 			recursiveBody(null);
 		}
 
-		private Uri _CreateUriString(string path)
-		{
-			//TODO reapply this
-			return null;
-
-			//var s = this._ConnectionSettings;
-			////var uri = s.ConnectionPool.GetNext();
-
-			//if (s.QueryStringParameters != null)
-			//{
-			//	var tempUri = new Uri(uri, path);
-			//	var qs = s.QueryStringParameters.ToQueryString(tempUri.Query.IsNullOrEmpty() ? "?" : "&");
-			//	path += qs;
-			//}
-			//uri = path.IsNullOrEmpty() ? uri : new Uri(uri, path);
-			//return uri.Purify();
-		}
+		
 
 	}
 }

src/Elasticsearch.Net/Connection/Transport.cs

@@ -7,6 +7,7 @@
 using Elasticsearch.Net.Exceptions;
 using Elasticsearch.Net.Providers;
 using Elasticsearch.Net.Serialization;
+using PUrify;
 
 namespace Elasticsearch.Net.Connection
 {
@@ -89,7 +90,7 @@ public ElasticsearchResponse DoRequest(
 
 			try
 			{
-				var uri = new Uri(baseUri, path);
+				var uri = CreateUriToPath(baseUri, path);
 				response = _doRequest(method, uri, postData);
 				if (response != null && response.SuccessOrKnownError)
 					return response;
@@ -160,7 +161,7 @@ public Task<ElasticsearchResponse> DoRequestAsync(
 			var postData = PostData(data);
 			int initialSeed;
 			var baseUri = this._connectionPool.GetNext(seed, out initialSeed);
-			var uri = new Uri(baseUri, path);
+			var uri = CreateUriToPath(baseUri, path);
 			return _doRequestAsync(method, uri, postData).ContinueWith(t=>
 			{
 				if (t.IsCanceled)
@@ -208,7 +209,19 @@ private Task<ElasticsearchResponse> _doRequestAsync(string method, Uri uri, byte
 			}
 			throw new Exception("Unknown HTTP method " + method);
 		}
-
+		
+		private Uri CreateUriToPath(Uri baseUri, string path)
+		{
+			var s = this.Settings;
+			if (s.QueryStringParameters != null)
+			{
+				var tempUri = new Uri(baseUri, path);
+				var qs = s.QueryStringParameters.ToQueryString(tempUri.Query.IsNullOrEmpty() ? "?" : "&");
+				path += qs;
+			}
+			var uri = path.IsNullOrEmpty() ? baseUri : new Uri(baseUri, path);
+			return uri.Purify();
+		}
 
 		private byte[] PostData(object data)
 		{

src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs

@@ -64,7 +64,7 @@ public virtual Uri GetNext(int? initialSeed, out int seed)
 			} while (attempts < count);
 
 			//could not find a suitable node retrying on node that has been dead longest.
-			return this._nodeUris[i]; //todo random;
+			return this._nodeUris[i]; 
 		}
 
 		public virtual void MarkDead(Uri uri)

src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs

@@ -72,12 +72,10 @@ public ElasticsearchDynamic Response
 
 
 
-		//TODO probably nicer if we make this factory ConnectionStatus.Error() and ConnectionStatus.Valid()
-		//and make these constructors private.
 		protected ElasticsearchResponse(IConnectionConfigurationValues settings)
 		{
 			this.Settings = settings;
-			this.Serializer = settings.Serializer; //TODO or default
+			this.Serializer = settings.Serializer; 
 		}
 
 		public static ElasticsearchResponse CreateError(IConnectionConfigurationValues settings, Exception e, string method, string path, byte[] request)

src/Elasticsearch.Net/Providers/Sniffer.cs

@@ -38,7 +38,6 @@ public static IList<Uri> FromStream(Stream stream, IElasticsearchSerializer seri
 				var l = new List<Uri>();
 				foreach(var kv in response.nodes.Values)
 				{
-					//TODO parse address since its in inet[] form
 					if (!kv.http_address.IsNullOrEmpty())
 						l.Add(Parse("http", kv.http_address));
 					else if (!kv.https_address.IsNullOrEmpty())

src/Nest/Exception/ReindexException.cs

@@ -5,7 +5,6 @@ namespace Nest
 {
 	public class ReindexException: Exception
 	{
-		//TODO NESTElasticsearchResponse?
 		public ElasticsearchResponse Status { get; private set; }
 
 		public ReindexException(ElasticsearchResponse status, string message = null) : base(message)

src/Nest/Resolvers/Converters/AggregationConverter.cs

@@ -50,7 +50,7 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize
 				case "doc_count":
 					return GetSingleBucketAggregation(reader, serializer);
 				default:
-					return null; //TODO assume nested
+					return null; 
 
 			}
 		}

src/Nest/Resolvers/Converters/CustomJsonConverter.cs

@@ -7,7 +7,6 @@
 
 namespace Nest.Resolvers.Converters
 {
-	//TODO rename and remove I Prefix
 	public class CustomJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType)

src/Tests/Elasticsearch.Net.Integration.Yaml/YamlTestsBase.cs

@@ -39,7 +39,6 @@ static YamlTestsBase()
 
 		}
 
-
 		public YamlTestsBase()
 		{
 			_client.IndicesDelete("*");

src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs

@@ -1,4 +1,5 @@
-using Elasticsearch.Net;
+using System.Runtime.Remoting.Channels;
+using Elasticsearch.Net;
 using Elasticsearch.Net.Connection;
 using NUnit.Framework;
 using System;
@@ -8,7 +9,7 @@ namespace Nest.Tests.Unit.Domain.Connection
 {
 	using System.Net;
 
-	public class TestConnection : HttpConnection
+	public class TestConnection : InMemoryConnection
 	{
 		public TestConnection(IConnectionSettingsValues settings)
 			: base(settings) { }
@@ -29,13 +30,11 @@ public void CanCreateConnectionWithCustomQueryStringParameters()
 			var uri = new Uri("http://localhost");
 			var query = new NameValueCollection { { "authToken", "ABCDEFGHIJK" } };
 			var connectionSettings = new ConnectionSettings(uri, "index").SetGlobalQueryStringParameters(query);
-			var connection = new TestConnection(connectionSettings);
-
-			// Act
-			var req = connection.GetConnection("", "GET");
+			var client = new ElasticClient(connectionSettings, new TestConnection(connectionSettings));
+			var result = client.RootNodeInfo();
 
 			// Assert
-			Assert.AreEqual(req.Address.ToString(), "http://localhost/?authToken=ABCDEFGHIJK");
+			Assert.AreEqual(result.ConnectionStatus.RequestUrl, "http://localhost/?authToken=ABCDEFGHIJK");
 		}
 
 		[Test]
@@ -45,13 +44,11 @@ public void CanCreateConnectionWithPathAndCustomQueryStringParameters()
 			var uri = new Uri("http://localhost:9000");
 			var query = new NameValueCollection { { "authToken", "ABCDEFGHIJK" } };
 			var connectionSettings = new ConnectionSettings(uri, "index").SetGlobalQueryStringParameters(query);
-			var connection = new TestConnection(connectionSettings);
-
-			// Act
-			var req = connection.GetConnection("index/", "GET");
+			var client = new ElasticClient(connectionSettings, new TestConnection(connectionSettings));
+			var result = client.IndexExists(ie=>ie.Index("index"));
 
 			// Assert
-			Assert.AreEqual(req.Address.ToString(), "http://localhost:9000/index/?authToken=ABCDEFGHIJK");
+			Assert.AreEqual(result.ConnectionStatus.RequestUrl, "http://localhost:9000/index?authToken=ABCDEFGHIJK");
 		}