Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

src/Tests/Nest.Tests.Integration/Aggregations/BucketAggregationTests.cs

@@ -24,7 +24,7 @@ public void Terms()
 		}
 
 		[Test]
-		[SkipVersion("1.0", "Significant terms aggregation not introduced until 1.1")]
+		[SkipVersion("0 - 1.0.9", "Significant terms aggregation not introduced until 1.1")]
 		public void SignificantTerms()
 		{
 			var results = this._client.Search<ElasticsearchProject>(s => s
@@ -84,7 +84,7 @@ public void Histogram()
 		}
 
 		[Test]
-		[SkipVersion("1.0", "Percentiles aggregation not introduced until 1.1")]
+		[SkipVersion("0 - 1.0.9", "Percentiles aggregation not introduced until 1.1")]
 		public void Percentiles()
 		{
 			var results = this._client.Search<ElasticsearchProject>(s => s
@@ -108,7 +108,7 @@ public void Percentiles()
 		}
 
 		[Test]
-		[SkipVersion("1.0", "Percentiles aggregation not introduced until 1.1")]
+		[SkipVersion("0 - 1.0.9", "Percentiles aggregation not introduced until 1.1")]
 		public void PercentilesCustom()
 		{
 			var results = this._client.Search<ElasticsearchProject>(s => s

src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs

@@ -56,7 +56,7 @@ public void Min()
 		}
 
 		[Test]
-		[SkipVersion("1.0", "Cardinality aggregation not introduced until 1.1")]
+		[SkipVersion("0 - 1.0.9", "Cardinality aggregation not introduced until 1.1")]
 		public void Cardinality()
 		{
 			var results = this._client.Search<ElasticsearchProject>(s => s

src/Tests/Nest.Tests.Integration/Attributes/SkipVersionAttribute.cs

@@ -9,26 +9,56 @@ namespace Nest.Tests.Integration
 {
 	public class SkipVersionAttribute : TestActionAttribute
 	{
-		private string _Version;
-		private string _Reason;
-		
-		public SkipVersionAttribute(string version)
-			: this(version, null)
+		private Version _lowerBound;
+		private Version _upperBound;
+		private string _reason;
+		private bool _inclusive;
+
+		public SkipVersionAttribute(string range, string reason, bool inclusive = true)
 		{
+			_reason = reason;
+			_inclusive = inclusive;
+
+			ParseVersions(range);
 		}
 
-		public SkipVersionAttribute(string version, string reason)
+		public override void BeforeTest(TestDetails testDetails)
 		{
-			_Version = version;
-			_Reason = reason;
+			var currentVersion = ElasticsearchConfiguration.CurrentVersion;
+
+			var skip = 
+				   (_inclusive && _upperBound >= currentVersion && currentVersion >= _lowerBound) ||
+				   (_upperBound > currentVersion && currentVersion > _lowerBound);
+			
+			if (skip)
+				Assert.Pass(_reason);
 		}
 
-		public override void BeforeTest(TestDetails testDetails)
+		private void ParseVersions(string range)
 		{
-			if (ElasticsearchConfiguration.CurrentVersion.Contains(_Version))
-			{
-				Assert.Pass(_Reason);
-			}
+			var bounds = range.Split('-').ToList();
+			if (bounds.Count > 2)
+				throw new ArgumentException("Failed to skip test: invalid range");
+
+			_lowerBound = Version.Parse(NormalizeVersion(bounds[0]));
+
+			var upperBound = bounds.Count == 2 ? bounds[1] : bounds[0];
+			_upperBound = Version.Parse(NormalizeVersion(upperBound));
+		}
+
+		private string NormalizeVersion(string version)
+		{
+			var format = "{0}.{1}.{2}";
+			var versionParts = version.Split('.').ToList();
+
+			if (versionParts.Count == 1)
+				return string.Format(format, versionParts[0], 0, 0);
+			else if (versionParts.Count == 2)
+				return string.Format(format, versionParts[0], versionParts[1], 0);
+			else if (versionParts.Count == 3)
+				return string.Format(format, versionParts[0], versionParts[1], versionParts[2]);
+			else
+				throw new ArgumentException("Failed to skip test: invalid version format");
 		}
 	}
 }

src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs

@@ -11,7 +11,8 @@ namespace Nest.Tests.Integration.Core.ClearScroll
 	public class ClearScrollTests : IntegrationTests
 	{
 		[Test]
-		[SkipVersion("1.0.2", "Scroll ids were not accepted in the request body until 1.0.3 (https://github.com/elasticsearch/elasticsearch/issues/5726)")]
+		[SkipVersion("0 - 1.0.2", "Scroll ids were not accepted in the request body until 1.0.3 (https://github.com/elasticsearch/elasticsearch/issues/5726)")]
+		[SkipVersion("1.1.0", "Scroll ids in request body broken in 1.1.0 and fixed in 1.1.1")]
 		public void ClearScroll()
 		{
 			var searchResults = this._client.Search<ElasticsearchProject>(s => s.Scroll("1m").SearchType(SearchType.Scan));

src/Tests/Nest.Tests.Integration/Core/TermVectors/MultiTermVectorsTests.cs

@@ -56,7 +56,7 @@ public void MultiTermVectorsTest_DocumentsInBody()
 		}
 
 		[Test]
-		[SkipVersion("1.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
+		[SkipVersion("1.2.0 - 1.2.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
 		public void MultiTermVectorsNonExistentIdTest()
 		{
 			var result = _client.MultiTermVectors<ElasticsearchProject>(s => s

src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs

@@ -91,7 +91,7 @@ public void TermVectorNonMappedFieldTest()
 		}
 
 		[Test]
-		[SkipVersion("1.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
+		[SkipVersion("1.2.0 - 1.2.2", "Fails against ES 1.2: https://github.com/elasticsearch/elasticsearch/issues/6451")]
 		public void TermVectorNonExistentIdTest()
 		{
 			var result = _client.TermVector<ElasticsearchProject>(s => s

src/Tests/Nest.Tests.Integration/ElasticsearchConfiguration.cs

@@ -9,12 +9,12 @@ public static class ElasticsearchConfiguration
 	{
 		public static readonly string DefaultIndex = Test.Default.DefaultIndex + "-" + Process.GetCurrentProcess().Id.ToString();
 
-		private static string _currentVersion;
-		public static string CurrentVersion
+		private static Version _currentVersion;
+		public static Version CurrentVersion
 		{
 			get
 			{
-				if (string.IsNullOrEmpty(_currentVersion))
+				if (_currentVersion == null)
 					_currentVersion = GetCurrentVersion();
 
 				return _currentVersion;
@@ -48,10 +48,12 @@ public static string NewUniqueIndexName()
 			return DefaultIndex + "_" + Guid.NewGuid().ToString();
 		}
 
-		public static string GetCurrentVersion()
+		public static Version GetCurrentVersion()
 		{
 			dynamic info = Client.Raw.Info().Response;
-			return info.version.number;
+			var version = Version.Parse(info.version.number);
+
+			return version;
 		}
 	}
 }

src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs

@@ -111,7 +111,7 @@ public void SimpleRenameAlias()
 		}
 
 		[Test]
-		[SkipVersion("1.0", "Adding aliases during index creation not introduced until 1.1")]
+		[SkipVersion("0 - 1.0.9", "Adding aliases during index creation not introduced until 1.1")]
 		public void AddAliasFromCreateIndex()
 		{
 			var indexName = ElasticsearchConfiguration.NewUniqueIndexName();

src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs

@@ -45,8 +45,8 @@ public void CloseAndSearchAndOpenIndex()
 
 			var error = results.ServerError;
 			error.Should().NotBeNull();
-			error.ExceptionType.Should().Be("ClusterBlockException");
-			error.Error.Should().Contain("index closed");
+			error.ExceptionType.Should().BeOneOf("ClusterBlockException", "IndexClosedException");
+			error.Error.Should().Contain("closed");
 
 			r = this._client.OpenIndex(ElasticsearchConfiguration.DefaultIndex);
 			Assert.True(r.Acknowledged);