Fix failing tests as a result of refactoring FieldSelection

Author: gmarz

src/Nest/CommonAbstractions/SerializationBehavior/StatefulDeserialization/ConcreteTypeConverter.cs

@@ -113,21 +113,16 @@ internal static object GetUsingConcreteTypeConverter<T>(
 			where T : class
 		{
 			var jObject = CreateIntermediateJObject(reader);
-			object fieldSelection;
-			var concreteType = GetConcreteTypeUsingSelector(serializer, realConcreteConverter, jObject, out fieldSelection);
+			var concreteType = GetConcreteTypeUsingSelector(serializer, realConcreteConverter, jObject);
 			var hit = GetHitTypeInstance(concreteType);
 			PopulateHit(serializer, jObject.CreateReader(), hit);
 
 			Action<object, object> cachedLookup;
 			if (ConcreteTypeConverter.FieldDelegates.TryGetValue(concreteType, out cachedLookup))
-			{
-				cachedLookup(hit, fieldSelection);
 				return hit;
-			}
 
 			var generic = ConcreteTypeConverter.MakeDelegateMethodInfo.MakeGenericMethod(concreteType);
 			cachedLookup = (h, f) => generic.Invoke(null, new[] { h, f });
-			cachedLookup(hit, fieldSelection);
 			ConcreteTypeConverter.FieldDelegates.TryAdd(concreteType, cachedLookup);
 			return hit;
 		}
@@ -149,7 +144,7 @@ private static object GetHitTypeInstance(Type concreteType)
 		internal static Type GetConcreteTypeUsingSelector<T>(
 			JsonSerializer serializer, 
 			ConcreteTypeConverter<T> realConcreteConverter, 
-			JObject jObject, out object selection)
+			JObject jObject)
 			where T: class
 		{
 			var settings = serializer.GetConnectionSettings();
@@ -175,14 +170,6 @@ internal static Type GetConcreteTypeUsingSelector<T>(
 			hitDynamic.Explanation = d._explanation is Explanation ? d._explanation : null;
 			object o = d._source ?? DynamicResponse.Create(fieldsDictionary) ?? new object {};
 			var concreteType = selector(o, hitDynamic);
-			
-			Type fieldSelectionType;
-			if (!ConcreteTypeConverter.TypeToFieldTypes.TryGetValue(concreteType, out fieldSelectionType))
-			{
-				fieldSelectionType = typeof(FieldValues).MakeGenericType(concreteType);
-				ConcreteTypeConverter.TypeToFieldTypes.TryAdd(concreteType, fieldSelectionType);
-			}
-			selection = fieldSelectionType.CreateInstance(settings, fieldsDictionary);
 			return concreteType;
 		}
 	}

src/Tests/Document/Single/Get/GetApiTests.cs

@@ -46,6 +46,8 @@ public class GetApiFieldsTests : GetApiTests
 	{
 		public GetApiFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override string UrlPath => $"/project/project/{this.ProjectId}?fields=name%2CnumberOfCommits";
+
 		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => g => g
 			.Fields(
 				p => p.Name, 
@@ -63,5 +65,7 @@ protected override void ExpectResponse(IGetResponse<Project> response)
 			response.Fields.ValueOf<Project, string>(p => p.Name).Should().Be(ProjectId);
 			response.Fields.ValueOf<Project, int>(p => p.NumberOfCommits).Should().BeGreaterThan(0);
 		}
+
+		protected override GetDescriptor<Project> NewDescriptor() => new GetDescriptor<Project>(ProjectId);
 	}
 }

src/Tests/Framework/ApiTestBase.cs

@@ -99,7 +99,7 @@ protected virtual void AssertUrl(Uri u)
 			var expectedUri = new UriBuilder("http", "localhost", Port, path, "?" + query).Uri;
 
 			u.AbsolutePath.Should().Be(expectedUri.AbsolutePath);
-			u = new UriBuilder(u.Scheme, u.Host, u.Port, u.AbsolutePath, u.Query.Replace("pretty=true", "")).Uri;
+			u = new UriBuilder(u.Scheme, u.Host, u.Port, u.AbsolutePath, u.Query.Replace("pretty=true&", "").Replace("pretty=true", "")).Uri;
 
 			var queries = new[] { u.Query, expectedUri.Query };
 			if (queries.All(string.IsNullOrWhiteSpace)) return;

src/Tests/Search/Search/SearchApiTests.cs

@@ -105,6 +105,38 @@ public class SearchApiFieldsTests : SearchApiTests
 	{
 		public SearchApiFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override object ExpectJson => new
+		{
+			from = 10,
+			size = 20,
+			query = new
+			{
+				match_all = new { }
+			},
+			aggs = new
+			{
+				startDates = new
+				{
+					terms = new
+					{
+						field = "startedOn"
+					}
+				}
+			},
+			post_filter = new
+			{
+				term = new
+				{
+					state = new
+					{
+						value = "Stable"
+					}
+
+				}
+			},
+			fields = new[] { "name", "numberOfCommits" }
+		};
+
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
 		.From(10)
 		.Size(20)