fixed global integration test setup by ignoreing ranges on project mock type if we are running tests below 5.2.0, ignored properties where they made sense

Mpdreamz · Mpdreamz · commit d4acecba9780 · 2017-02-15T14:08:22.000+01:00
diff --git a/src/Tests/Framework/EndpointTests/Bootstrappers/Seeder.cs b/src/Tests/Framework/EndpointTests/Bootstrappers/Seeder.cs
@@ -159,7 +159,8 @@ public static IAnalysis ProjectAnalysisSettings(AnalysisDescriptor analysis)
                         .Tokenizer("standard")
                     )
                 );
-			if (new SemVer.Range(">=5.2.0").IsSatisfied(TestClient.Configuration.ElasticsearchVersion))
+			//normalizers are a new feature since 5.2.0
+			if (TestClient.VersionUnderTestSatisfiedBy(">=5.2.0"))
 				analysis.Normalizers(analyzers => analyzers
 					.Custom("my_normalizer", n => n
 						.Filters("lowercase", "asciifolding")
diff --git a/src/Tests/Framework/TestClient.cs b/src/Tests/Framework/TestClient.cs
@@ -55,10 +55,7 @@ private static ITestConfiguration LoadConfiguration()
 		private static ConnectionSettings DefaultSettings(ConnectionSettings settings) => settings
 			.DefaultIndex("default-index")
 			.PrettyJson()
-			.InferMappingFor<Project>(map => map
-				.IndexName("project")
-				.IdProperty(p => p.Name)
-			)
+			.InferMappingFor<Project>(ProjectMapping)
 			.InferMappingFor<CommitActivity>(map => map
 				.IndexName("project")
 				.TypeName("commits")
@@ -79,6 +76,18 @@ private static ConnectionSettings DefaultSettings(ConnectionSettings settings) =
 
 			.OnRequestDataCreated(data=> data.Headers.Add("TestMethod", ExpensiveTestNameForIntegrationTests()));
 
+		private static IClrTypeMapping<Project> ProjectMapping(ClrTypeMappingDescriptor<Project> m)
+		{
+			m.IndexName("project").IdProperty(p => p.Name);
+			//*_range type only available since 5.2.0
+			if (VersionUnderTestSatisfiedBy("<5.2.0"))
+				m.Ignore(p => p.Ranges);
+			return m;
+		}
+
+		public static bool VersionUnderTestSatisfiedBy(string versionRange) =>
+			new SemVer.Range(versionRange).IsSatisfied(TestClient.Configuration.ElasticsearchVersion);
+
 		public static string PercolatorType => Configuration.ElasticsearchVersion <= new ElasticsearchVersion("5.0.0-alpha1") ? ".percolator" : "query";
 
 
diff --git a/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs b/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
@@ -11,7 +11,8 @@
 
 namespace Tests.Indices.MappingManagement.GetMapping
 {
-	public class GetMappingApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest, GetMappingDescriptor<Project>, GetMappingRequest>
+	public class GetMappingApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest, GetMappingDescriptor<Project>,
+		GetMappingRequest>
 	{
 		public GetMappingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
@@ -43,7 +44,9 @@ protected override void ExpectResponse(IGetMappingResponse response)
 			response.Accept(visitor);
 
 			visitor.CountsShouldContainKeyAndCountBe("type", 1);
-			visitor.CountsShouldContainKeyAndCountBe("object", 5);
+			//ranges property is ignored on versions before 5.2.0
+			var supportsRanges = TestClient.VersionUnderTestSatisfiedBy(">=5.2.0");
+			visitor.CountsShouldContainKeyAndCountBe("object", supportsRanges ? 5 : 4);
 			visitor.CountsShouldContainKeyAndCountBe("date", 4);
 			visitor.CountsShouldContainKeyAndCountBe("text", 11);
 			visitor.CountsShouldContainKeyAndCountBe("keyword", 9);
@@ -52,19 +55,25 @@ protected override void ExpectResponse(IGetMappingResponse response)
 			visitor.CountsShouldContainKeyAndCountBe("geo_point", 2);
 			visitor.CountsShouldContainKeyAndCountBe("completion", 2);
 			visitor.CountsShouldContainKeyAndCountBe("nested", 1);
-			visitor.CountsShouldContainKeyAndCountBe("date_range", 1);
-			visitor.CountsShouldContainKeyAndCountBe("float_range", 1);
-			visitor.CountsShouldContainKeyAndCountBe("integer_range", 1);
-			visitor.CountsShouldContainKeyAndCountBe("double_range", 1);
-			visitor.CountsShouldContainKeyAndCountBe("long_range", 1);
+			if (supportsRanges)
+			{
+				visitor.CountsShouldContainKeyAndCountBe("date_range", 1);
+				visitor.CountsShouldContainKeyAndCountBe("float_range", 1);
+				visitor.CountsShouldContainKeyAndCountBe("integer_range", 1);
+				visitor.CountsShouldContainKeyAndCountBe("double_range", 1);
+				visitor.CountsShouldContainKeyAndCountBe("long_range", 1);
+			}
 		}
 	}
 
-	public class GetMappingNonExistentIndexApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest, GetMappingDescriptor<Project>, GetMappingRequest>
+	public class GetMappingNonExistentIndexApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetMappingResponse, IGetMappingRequest,
+		GetMappingDescriptor<Project>, GetMappingRequest>
 	{
 		private string _nonExistentIndex = "non-existent-index";
 
-		public GetMappingNonExistentIndexApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public GetMappingNonExistentIndexApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		{
+		}
 
 		protected override LazyResponses ClientUsage() => Calls(
 			fluent: (client, f) => client.GetMapping<Project>(f),
@@ -122,11 +131,14 @@ public void CountsShouldContainKeyAndCountBe(string key, int count)
 		}
 
 #pragma warning disable 618
+
 		public void Visit(IStringProperty mapping)
 		{
 			Increment("string");
 		}
+
 #pragma warning restore 618
+
 		public void Visit(IDateProperty mapping)
 		{
 			Increment("date");
diff --git a/src/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs b/src/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
@@ -9,6 +9,7 @@
 
 namespace Tests.Indices.MappingManagement.PutMapping
 {
+	[SkipVersion("<5.2.0", "This uses the range types introduced in 5.2.0")]
 	public class PutMappingApiTests
 		: ApiIntegrationAgainstNewIndexTestBase
 			<WritableCluster, IPutMappingResponse, IPutMappingRequest, PutMappingDescriptor<Project>, PutMappingRequest<Project>>
diff --git a/src/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs b/src/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
@@ -8,6 +8,7 @@
 
 namespace Tests.Mapping.Types.Core.Keyword
 {
+	[SkipVersion("<5.2.0", "This uses the normalizer feature introduced in 5.2.0")]
 	public class KeywordPropertyTests : PropertyTestsBase
 	{
 		public KeywordPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
diff --git a/src/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs b/src/Tests/Mapping/Types/Core/Range/DateRange/DateRangeAttributeTests.cs
@@ -1,5 +1,6 @@
 ﻿using System.Reflection;
 using Nest;
+using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.DateRange
 {
@@ -9,6 +10,7 @@ public class DateRangeTest
 		public Nest.DateRange Range { get; set; }
 	}
 
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class DateRangeAttributeTests : AttributeTestsBase<DateRangeTest>
 	{
 		protected override object ExpectJson => new
diff --git a/src/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs b/src/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Core.Range.DateRange
 {
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class DateRangePropertyTests : PropertyTestsBase
 	{
 		private DateTime _nullValue = new DateTime(2000, 1, 1, 1, 1, 1, 1, DateTimeKind.Utc);
diff --git a/src/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs b/src/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangeAttributeTests.cs
@@ -1,4 +1,5 @@
 ﻿using Nest;
+using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.DoubleRange
 {
@@ -8,6 +9,7 @@ public class DoubleRangeTest
 		public Nest.DoubleRange Range { get; set; }
 	}
 
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class DoubleRangeAttributeTests : AttributeTestsBase<DoubleRangeTest>
 	{
 		protected override object ExpectJson => new
diff --git a/src/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs b/src/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Core.Range.DoubleRange
 {
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class DoubleRangePropertyTests : PropertyTestsBase
 	{
 		public DoubleRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
diff --git a/src/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs b/src/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangeAttributeTests.cs
@@ -1,4 +1,5 @@
 ﻿using Nest;
+using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.FloatRange
 {
@@ -8,6 +9,7 @@ public class FloatRangeTest
 		public Nest.FloatRange Range { get; set; }
 	}
 
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class FloatRangeAttributeTests : AttributeTestsBase<FloatRangeTest>
 	{
 		protected override object ExpectJson => new
diff --git a/src/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs b/src/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Core.Range.FloatRange
 {
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class FloatRangePropertyTests : PropertyTestsBase
 	{
 		public FloatRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
diff --git a/src/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs b/src/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangeAttributeTests.cs
@@ -1,4 +1,5 @@
 ﻿using Nest;
+using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.IntegerRange
 {
@@ -8,6 +9,7 @@ public class IntegerRangeTest
 		public Nest.IntegerRange Range { get; set; }
 	}
 
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class IntegerRangeAttributeTests : AttributeTestsBase<IntegerRangeTest>
 	{
 		protected override object ExpectJson => new
diff --git a/src/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs b/src/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Core.Range.IntegerRange
 {
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class IntegerRangePropertyTests : PropertyTestsBase
 	{
 		public IntegerRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
diff --git a/src/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs b/src/Tests/Mapping/Types/Core/Range/LongRange/LongRangeAttributeTests.cs
@@ -1,4 +1,5 @@
 ﻿using Nest;
+using Tests.Framework;
 
 namespace Tests.Mapping.Types.Core.Range.LongRange
 {
@@ -8,6 +9,7 @@ public class LongRangeTest
 		public Nest.LongRange Range { get; set; }
 	}
 
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class LongRangeAttributeTests : AttributeTestsBase<LongRangeTest>
 	{
 		protected override object ExpectJson => new
diff --git a/src/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs b/src/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Core.Range.LongRange
 {
+	[SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]
 	public class LongRangePropertyTests : PropertyTestsBase
 	{
 		public LongRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
diff --git a/src/Tests/tests.yaml b/src/Tests/tests.yaml
@@ -1,8 +1,8 @@
 ﻿# mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: i
 # the elasticsearch version that should be started
 # Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
-elasticsearch_version: 5.2.0
+elasticsearch_version: 5.0.2
 # cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
 # cluster_filter:
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Tests.Indices.MappingManagement.PutMapping`
`11`	`11`	`{`
	`12`	`+ [SkipVersion("<5.2.0", "This uses the range types introduced in 5.2.0")]`
`12`	`13`	`public class PutMappingApiTests`
`13`	`14`	`: ApiIntegrationAgainstNewIndexTestBase`
`14`	`15`	`<WritableCluster, IPutMappingResponse, IPutMappingRequest, PutMappingDescriptor<Project>, PutMappingRequest<Project>>`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Tests.Mapping.Types.Core.Keyword`
`10`	`10`	`{`
	`11`	`+ [SkipVersion("<5.2.0", "This uses the normalizer feature introduced in 5.2.0")]`
`11`	`12`	`public class KeywordPropertyTests : PropertyTestsBase`
`12`	`13`	`{`
`13`	`14`	`public KeywordPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using Nest;`
	`3`	`+using Tests.Framework;`
`3`	`4`
`4`	`5`	`namespace Tests.Mapping.Types.Core.Range.DateRange`
`5`	`6`	`{`
`@@ -9,6 +10,7 @@ public class DateRangeTest`
`9`	`10`	`public Nest.DateRange Range { get; set; }`
`10`	`11`	`}`
`11`	`12`
	`13`	`+ [SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]`
`12`	`14`	`public class DateRangeAttributeTests : AttributeTestsBase<DateRangeTest>`
`13`	`15`	`{`
`14`	`16`	`protected override object ExpectJson => new`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Nest;`
	`3`	`+using Tests.Framework;`
`3`	`4`	`using Tests.Framework.Integration;`
`4`	`5`	`using Tests.Framework.MockData;`
`5`	`6`
`6`	`7`	`namespace Tests.Mapping.Types.Core.Range.DateRange`
`7`	`8`	`{`
	`9`	`+ [SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]`
`8`	`10`	`public class DateRangePropertyTests : PropertyTestsBase`
`9`	`11`	`{`
`10`	`12`	`private DateTime _nullValue = new DateTime(2000, 1, 1, 1, 1, 1, 1, DateTimeKind.Utc);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Nest;`
	`2`	`+using Tests.Framework;`
`2`	`3`
`3`	`4`	`namespace Tests.Mapping.Types.Core.Range.DoubleRange`
`4`	`5`	`{`
`@@ -8,6 +9,7 @@ public class DoubleRangeTest`
`8`	`9`	`public Nest.DoubleRange Range { get; set; }`
`9`	`10`	`}`
`10`	`11`
	`12`	`+ [SkipVersion("<5.2.0", "dedicated range types is a new 5.2.0 feature")]`
`11`	`13`	`public class DoubleRangeAttributeTests : AttributeTestsBase<DoubleRangeTest>`
`12`	`14`	`{`
`13`	`15`	`protected override object ExpectJson => new`