7.x integration tests fixes (#4166)

* fix #4154 should be more version independent

* fix putmapping API test now that [Shape] is no longer attributed on ArbitraryShape

Author: Mpdreamz

src/Tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs

@@ -342,9 +342,6 @@ public static PropertiesDescriptor<TProject> ProjectProperties<TProject>(Propert
 				.GeoShape(g => g
 					.Name(p => p.LocationShape)
 				)
-				.Shape(g => g
-					.Name(p => p.ArbitraryShape)
-				)
 				.Completion(cm => cm
 					.Name(p => p.Suggest)
 					.Contexts(cx => cx
@@ -377,6 +374,11 @@ public static PropertiesDescriptor<TProject> ProjectProperties<TProject>(Propert
 					.Enabled(false)
 				);
 
+			if (TestConfiguration.Instance.InRange(">=7.4.0"))
+				props.Shape(g => g
+					.Name(p => p.ArbitraryShape)
+				);
+
 			return props;
 		}
 

src/Tests/Tests.Domain/Project.cs

@@ -45,7 +45,6 @@ public class Project
 		public SimpleGeoPoint LocationPoint { get; set; }
 		public IGeoShape LocationShape { get; set; }
 
-		[Shape] // Explicity map as a shape type
 		public IGeoShape ArbitraryShape { get; set; }
 		public Dictionary<string, Metadata> Metadata { get; set; }
 		public string Name { get; set; }

src/Tests/Tests/CodeStandards/Serialization/Enums.cs

@@ -11,7 +11,6 @@
 using FluentAssertions;
 using Nest;
 using Tests.Core.Serialization;
-using Tests.QueryDsl.Geo.Shape;
 using Tests.XPack.MachineLearning;
 
 namespace Tests.CodeStandards.Serialization

src/Tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs

@@ -164,6 +164,7 @@ public PutMappingApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 					.Name(p => p.Name)
 					.Index(false)
 				)
+				.Shape(shape => shape.Name(p => p.ArbitraryShape))
 				.Object<Developer>(o => o
 					.Name(p => p.LeadDeveloper)
 					.AutoMap()

src/Tests/Tests/QueryDsl/Specialized/Shape/ShapeQueryUsageTests.cs

@@ -5,7 +5,7 @@
 using Tests.Domain;
 using Tests.Framework.EndpointTests.TestState;
 
-namespace Tests.QueryDsl.Geo.Shape
+namespace Tests.QueryDsl.Specialized.Shape
 {
 	/**
 	 * Like geo_shape, Elasticsearch supports the ability to index arbitrary two dimension (non Geospatial) geometries making
@@ -14,6 +14,7 @@ namespace Tests.QueryDsl.Geo.Shape
 	 *
 	 * See the Elasticsearch documentation on {ref_current}/query-dsl-shape-query.html[shape queries] for more detail.
 	 */
+	[SkipVersion("<7.4.0", "Shape queries introduced in 7.4.0+")]
 	public abstract class ShapeQueryUsageTestsBase : QueryDslUsageTestsBase
 	{
 		protected static readonly GeoCoordinate CircleCoordinates = new GeoCoordinate(-45.0, 45.0);
@@ -153,58 +154,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 			);
 	}
 
-	// hide
-	[SkipVersion(">=7.0.0", "Multipoint queries are not supported in shape queries")]
-	public class ShapeMultiPointQueryUsageTests : ShapeQueryUsageTestsBase
-	{
-		public ShapeMultiPointQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IShapeQuery>(a => a.Shape)
-		{
-			q => q.Field = null,
-			q => q.Shape = null,
-			q => ((IMultiPointGeoShape)q.Shape).Coordinates = null,
-		};
-
-		protected override QueryContainer QueryInitializer => new ShapeQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Infer.Field<Project>(p => p.ArbitraryShape),
-			Shape = new MultiPointGeoShape(MultiPointCoordinates),
-			Relation = ShapeRelation.Intersects,
-		};
-
-		protected override object QueryJson => new
-		{
-			shape = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				arbitraryShape = new
-				{
-					relation = "intersects",
-					shape = new
-					{
-						type = "multipoint",
-						coordinates = MultiPointCoordinates
-					}
-				}
-			}
-		};
-
-		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.Shape(c => c
-				.Name("named_query")
-				.Boost(1.1)
-				.Field(p => p.ArbitraryShape)
-				.Shape(s => s
-					.MultiPoint(MultiPointCoordinates)
-				)
-				.Relation(ShapeRelation.Intersects)
-			);
-	}
-
 	/**
 	 * [float]
 	 * [[shape-query-linestring]]
@@ -597,59 +546,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 			);
 	}
 
-	// hide
-	[SkipVersion(">=7.0.0", "Circle queries are not supported in shape queries")]
-	public class ShapeCircleQueryUsageTests : ShapeQueryUsageTestsBase
-	{
-		public ShapeCircleQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
-
-		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IShapeQuery>(a => a.Shape)
-		{
-			q => q.Field = null,
-			q => q.Shape = null,
-			q => ((ICircleGeoShape)q.Shape).Coordinates = null,
-		};
-
-		protected override QueryContainer QueryInitializer => new ShapeQuery
-		{
-			Name = "named_query",
-			Boost = 1.1,
-			Field = Infer.Field<Project>(p => p.ArbitraryShape),
-			Shape = new CircleGeoShape(CircleCoordinates, "100m"),
-			Relation = ShapeRelation.Intersects,
-		};
-
-		protected override object QueryJson => new
-		{
-			shape = new
-			{
-				_name = "named_query",
-				boost = 1.1,
-				arbitraryShape = new
-				{
-					relation = "intersects",
-					shape = new
-					{
-						type = "circle",
-						radius = "100m",
-						coordinates = CircleCoordinates
-					}
-				}
-			}
-		};
-
-		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
-			.Shape(c => c
-				.Name("named_query")
-				.Boost(1.1)
-				.Field(p => p.ArbitraryShape)
-				.Shape(s => s
-					.Circle(CircleCoordinates, "100m")
-				)
-				.Relation(ShapeRelation.Intersects)
-			);
-	}
-
 	/**
 	* [float]
 	* [[shape-query-indexedshape]]

src/Tests/Tests/QueryDsl/Specialized/Shape/ShapeSerializationTests.cs

@@ -12,8 +12,9 @@
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
 
-namespace Tests.QueryDsl.Geo.Shape
+namespace Tests.QueryDsl.Specialized.Shape
 {
+	[SkipVersion("<7.4.0", "Shape queries introduced in 7.4.0+")]
 	public abstract class ShapeSerializationTestsBase
 		: ApiIntegrationTestBase<IntrusiveOperationCluster,
 			ISearchResponse<Domain.Shape>,