Fix mapping and terms list integration tests

Author: russcam

src/Tests/Framework/Integration/Bootstrappers/Seeder.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using Nest;
 using Tests.Framework.MockData;
@@ -187,6 +188,9 @@ public static PropertiesDescriptor<Project> ProjectProperties(PropertiesDescript
 				.Number(n => n
 					.Name(p => p.NumberOfCommits)
 					.Store()
+				)
+				.Object<Dictionary<string,Metadata>>(o => o
+					.Name(p => p.Metadata)
 				);
 
 		private static PropertiesDescriptor<Tag> TagProperties(PropertiesDescriptor<Tag> props) => props

src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs

@@ -44,9 +44,10 @@ protected override void ExpectResponse(IGetMappingResponse response)
 			response.Accept(visitor);
 
 			visitor.CountsShouldContainKeyAndCountBe("type", 1);
-			visitor.CountsShouldContainKeyAndCountBe("object", 2);
+			visitor.CountsShouldContainKeyAndCountBe("object", 3);
 			visitor.CountsShouldContainKeyAndCountBe("date", 4);
-			visitor.CountsShouldContainKeyAndCountBe("string", 17);
+			visitor.CountsShouldContainKeyAndCountBe("text", 8);
+			visitor.CountsShouldContainKeyAndCountBe("keyword", 9);
 			visitor.CountsShouldContainKeyAndCountBe("ip", 1);
 			visitor.CountsShouldContainKeyAndCountBe("number", 2);
 			visitor.CountsShouldContainKeyAndCountBe("geo_point", 2);
@@ -151,11 +152,6 @@ public void Visit(BooleanProperty mapping)
 			Increment("boolean");
 		}
 
-		public void Visit(NumberType mapping)
-		{
-			throw new InvalidOperationException("NumberType should never be called");
-		}
-
 		public void Visit(TextProperty mapping)
 		{
 			Increment("text");

src/Tests/QueryDsl/TermLevel/Terms/TermsListQueryUsageTests.cs

@@ -46,6 +46,9 @@ public TermsListOfListIntegrationTests(ReadOnlyCluster cluster, EndpointUsage us
 
 		private List<List<string>> _terms = new List<List<string>> { new List<string> { "term1", "term2" } };
 
+		protected override int ExpectStatusCode => 400;
+		protected override bool ExpectIsValid => false;
+
 		protected override object QueryJson => new
 		{
 			terms = new
@@ -72,6 +75,18 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Terms(_terms)
 			);
 
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.IsValid.Should().BeFalse();
+
+			response.ServerError.Should().NotBeNull();
+			response.ServerError.Status.Should().Be(400);
+			response.ServerError.Error.Should().NotBeNull();
+			var rootCauses = response.ServerError.Error.RootCause;
+			rootCauses.Should().NotBeNullOrEmpty();
+			var rootCause = rootCauses.First();
+			rootCause.Type.Should().Be("parsing_exception");
+		}
 	}
 
 	public class TermsListOfListStringAgainstNumericFieldIntegrationTests : QueryDslIntegrationTestsBase
@@ -110,16 +125,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Terms(_terms)
 			);
 
-		[I] public Task AsserResponse() => AssertOnAllResponses(r =>
+		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
-			r.ServerError.Should().NotBeNull();
-			r.ServerError.Status.Should().Be(400);
-			r.ServerError.Error.Should().NotBeNull();
-			var rootCauses = r.ServerError.Error.RootCause;
+			response.ServerError.Should().NotBeNull();
+			response.ServerError.Status.Should().Be(400);
+			response.ServerError.Error.Should().NotBeNull();
+			var rootCauses = response.ServerError.Error.RootCause;
 			rootCauses.Should().NotBeNullOrEmpty();
 			var rootCause = rootCauses.First();
-			rootCause.Type.Should().Be("number_format_exception");
-		});
+			rootCause.Type.Should().Be("parsing_exception");
+		}
 
 	}