Added SkipVersion attribute to tests where appropriate after adding support for ES 1.4 features

gmarz · gmarz · commit 92f5c96ff910 · 2015-01-26T13:51:11.000-05:00
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/BucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/BucketAggregationTests.cs
@@ -86,6 +86,25 @@ public void SignificantTermsWithBackgroundFilter()
 
 		[Test]
 		public void Histogram()
+		{
+			var results = this.Client.Search<ElasticsearchProject>(s => s
+				.Size(0)
+				.Aggregations(a => a
+					.Histogram("bucket_agg", m => m
+						.Field(p => p.IntValues)
+						.Interval(10)
+					)
+
+				)
+			);
+			results.IsValid.Should().BeTrue();
+			var bucket = results.Aggs.Histogram("bucket_agg");
+			bucket.Items.Should().NotBeEmpty();
+		}
+
+		[Test]
+		[SkipVersion("0 - 1.3.9", "pre_offset and post_offset added in ES 1.4")]
+		public void HistogramWithOffsets()
 		{
 			var results = this.Client.Search<ElasticsearchProject>(s => s
 				.Size(0)
@@ -99,6 +118,7 @@ public void Histogram()
 
 				)
 			);
+
 			results.IsValid.Should().BeTrue();
 			var bucket = results.Aggs.Histogram("bucket_agg");
 			bucket.Items.Should().NotBeEmpty();
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/FIltersAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/FIltersAggregationTests.cs
@@ -11,6 +11,7 @@ public class FiltersAggregationTests : IntegrationTests
 		private readonly string _indexedName = NestTestData.Data[3].Name;
 		private readonly string _indexedCountry = NestTestData.Data[2].Country;
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]
 		public void NamedFilters()
 		{
 
@@ -43,6 +44,7 @@ public void NamedFilters()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]
 		public void AnonymousFilters()
 		{
 			var results = this.Client.Search<ElasticsearchProject>(s => s
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/SingleBucketAggregationTests.cs
@@ -62,6 +62,7 @@ public void Global()
 		}
 		
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Children aggregation added in ES 1.4")]
 		public void Children()
 		{
 			var results = this.Client.Search<Parent>(s => s
diff --git a/src/Tests/Nest.Tests.Integration/Core/Exists/SearchExistsTests.cs b/src/Tests/Nest.Tests.Integration/Core/Exists/SearchExistsTests.cs
@@ -9,6 +9,7 @@ namespace Nest.Tests.Integration.Core.Exists
 	public class SearchExistsTests : IntegrationTests
 	{
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]
 		public void ShouldNotExist_WrongIndex()
 		{
 			var r = this.Client.SearchExists<ElasticsearchProject>(f=>f.Index("yadadadadadaadada"));
@@ -18,6 +19,7 @@ public void ShouldNotExist_WrongIndex()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]
 		public void ShouldNotExist_WrongData()
 		{
 			var lookfor = NestTestData.Data.First().Country + "blah";
@@ -28,6 +30,7 @@ public void ShouldNotExist_WrongData()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]
 		public void ShouldExist()
 		{
 			var lookfor = NestTestData.Data.First().Country;
diff --git a/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs b/src/Tests/Nest.Tests.Integration/Core/Repository/CreateRepositoryTests.cs
@@ -23,14 +23,18 @@ public void CreateAndValidateAndDeleteRepository_ThenSnapshotWithWait()
 			createReposResult.IsValid.Should().BeTrue();
 			createReposResult.Acknowledged.Should().BeTrue();
 
-			var validateResponse = this.Client.VerifyRepository(new VerifyRepositoryRequest(repositoryName));
-			validateResponse.IsValid.Should().BeTrue();
+			// Repository verification added in ES 1.4
+			if (ElasticsearchConfiguration.CurrentVersion > new Version("1.3.9"))
+			{
+				var validateResponse = this.Client.VerifyRepository(new VerifyRepositoryRequest(repositoryName));
+				validateResponse.IsValid.Should().BeTrue();
 
-			validateResponse.Nodes.Should().NotBeEmpty();
-			var kv = validateResponse.Nodes.First();
-			kv.Key.Should().NotBeNullOrWhiteSpace();
-			kv.Value.Should().NotBeNull();
-			kv.Value.Name.Should().NotBeNullOrWhiteSpace();
+				validateResponse.Nodes.Should().NotBeEmpty();
+				var kv = validateResponse.Nodes.First();
+				kv.Key.Should().NotBeNullOrWhiteSpace();
+				kv.Value.Should().NotBeNull();
+				kv.Value.Name.Should().NotBeNullOrWhiteSpace();
+			}
 
 			var backupName = ElasticsearchConfiguration.NewUniqueIndexName();
 			var snapshotResponse = this.Client.Snapshot(repositoryName, backupName, selector: f => f
@@ -59,7 +63,7 @@ public void CreateAndValidateAndDeleteRepository_ThenSnapshotWithWait()
 			deleteReposResult.IsValid.Should().BeTrue();
 			deleteReposResult.Acknowledged.Should().BeTrue();
 		}
-		
+
 		[Test]
 		public void CreateAndDeleteRepository_ThenSnapshotWithoutWait()
 		{
diff --git a/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs b/src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs
@@ -22,6 +22,7 @@ public void TermVectorDefaultsTest()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Term vector artificial documents added in ES 1.4")]
 		public void TermVectorDocument()
 		{
 			var document = NestTestData.Data.FirstOrDefault(d => d.Id == 1);
@@ -31,6 +32,7 @@ public void TermVectorDocument()
 
 			AssertContentsVectors(result);
 		}
+
 		private static void AssertContentsVectors(ITermVectorResponse result)
 		{
 			result.IsValid.Should().BeTrue();
diff --git a/src/Tests/Nest.Tests.Integration/Indices/UpgradeTests.cs b/src/Tests/Nest.Tests.Integration/Indices/UpgradeTests.cs
@@ -12,6 +12,7 @@ namespace Nest.Tests.Integration.Indices
 	public class UpgradeTests : IntegrationTests
 	{
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]
 		public void UpgradeAllTest()
 		{
 			var response = this.Client.Upgrade();
@@ -26,6 +27,7 @@ public void UpgradeAllTest()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]
 		public void UpgradeTest()
 		{
 			var index = ElasticsearchConfiguration.DefaultIndex;
@@ -41,6 +43,7 @@ public void UpgradeTest()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]
 		public void UpgradeStatusAllTest()
 		{
 			var response = this.Client.UpgradeStatus();
@@ -53,6 +56,7 @@ public void UpgradeStatusAllTest()
 		}
 
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]
 		public void UpgradeStatusTest()
 		{
 			var index = ElasticsearchConfiguration.DefaultIndex;
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce1181Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce1181Tests.cs
@@ -13,6 +13,7 @@ namespace Nest.Tests.Integration.Reproduce
 	public class Reproduce1181Tests : IntegrationTests
 	{
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]
 		public void FiltersAggregationResponseNotReadToCompletion()
 		{
 			var result = this.Client.Search<ElasticsearchProject>(s => s
diff --git a/src/Tests/Nest.Tests.Integration/Search/TerminateAfterTests.cs b/src/Tests/Nest.Tests.Integration/Search/TerminateAfterTests.cs
@@ -11,6 +11,7 @@ namespace Nest.Tests.Integration.Search
 	public class TerminateAfterTests : IntegrationTests
 	{
 		[Test]
+		[SkipVersion("0 - 1.3.9", "Terminate after added in ES 1.4")]
 		public void TerminatedEarlyIsSet()
 		{
 			var queryResults = this.Client.Search<ElasticsearchProject>(s=>s

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class FiltersAggregationTests : IntegrationTests`
`11`	`11`	`private readonly string _indexedName = NestTestData.Data[3].Name;`
`12`	`12`	`private readonly string _indexedCountry = NestTestData.Data[2].Country;`
`13`	`13`	`[Test]`
	`14`	`+ [SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]`
`14`	`15`	`public void NamedFilters()`
`15`	`16`	`{`
`16`	`17`
`@@ -43,6 +44,7 @@ public void NamedFilters()`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`[Test]`
	`47`	`+ [SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]`
`46`	`48`	`public void AnonymousFilters()`
`47`	`49`	`{`
`48`	`50`	`var results = this.Client.Search<ElasticsearchProject>(s => s`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public void Global()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`[Test]`
	`65`	`+ [SkipVersion("0 - 1.3.9", "Children aggregation added in ES 1.4")]`
`65`	`66`	`public void Children()`
`66`	`67`	`{`
`67`	`68`	`var results = this.Client.Search<Parent>(s => s`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Nest.Tests.Integration.Core.Exists`
`9`	`9`	`public class SearchExistsTests : IntegrationTests`
`10`	`10`	`{`
`11`	`11`	`[Test]`
	`12`	`+ [SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]`
`12`	`13`	`public void ShouldNotExist_WrongIndex()`
`13`	`14`	`{`
`14`	`15`	`var r = this.Client.SearchExists<ElasticsearchProject>(f=>f.Index("yadadadadadaadada"));`
`@@ -18,6 +19,7 @@ public void ShouldNotExist_WrongIndex()`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`[Test]`
	`22`	`+ [SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]`
`21`	`23`	`public void ShouldNotExist_WrongData()`
`22`	`24`	`{`
`23`	`25`	`var lookfor = NestTestData.Data.First().Country + "blah";`
`@@ -28,6 +30,7 @@ public void ShouldNotExist_WrongData()`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`[Test]`
	`33`	`+ [SkipVersion("0 - 1.3.9", "Search exists api added in ES 1.4")]`
`31`	`34`	`public void ShouldExist()`
`32`	`35`	`{`
`33`	`36`	`var lookfor = NestTestData.Data.First().Country;`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public void TermVectorDefaultsTest()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Test]`
	`25`	`+ [SkipVersion("0 - 1.3.9", "Term vector artificial documents added in ES 1.4")]`
`25`	`26`	`public void TermVectorDocument()`
`26`	`27`	`{`
`27`	`28`	`var document = NestTestData.Data.FirstOrDefault(d => d.Id == 1);`
`@@ -31,6 +32,7 @@ public void TermVectorDocument()`
`31`	`32`
`32`	`33`	`AssertContentsVectors(result);`
`33`	`34`	`}`
	`35`	`+`
`34`	`36`	`private static void AssertContentsVectors(ITermVectorResponse result)`
`35`	`37`	`{`
`36`	`38`	`result.IsValid.Should().BeTrue();`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace Nest.Tests.Integration.Indices`
`12`	`12`	`public class UpgradeTests : IntegrationTests`
`13`	`13`	`{`
`14`	`14`	`[Test]`
	`15`	`+ [SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]`
`15`	`16`	`public void UpgradeAllTest()`
`16`	`17`	`{`
`17`	`18`	`var response = this.Client.Upgrade();`
`@@ -26,6 +27,7 @@ public void UpgradeAllTest()`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`[Test]`
	`30`	`+ [SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]`
`29`	`31`	`public void UpgradeTest()`
`30`	`32`	`{`
`31`	`33`	`var index = ElasticsearchConfiguration.DefaultIndex;`
`@@ -41,6 +43,7 @@ public void UpgradeTest()`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`[Test]`
	`46`	`+ [SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]`
`44`	`47`	`public void UpgradeStatusAllTest()`
`45`	`48`	`{`
`46`	`49`	`var response = this.Client.UpgradeStatus();`
`@@ -53,6 +56,7 @@ public void UpgradeStatusAllTest()`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`[Test]`
	`59`	`+ [SkipVersion("0 - 1.3.9", "Upgrade api added in ES 1.4")]`
`56`	`60`	`public void UpgradeStatusTest()`
`57`	`61`	`{`
`58`	`62`	`var index = ElasticsearchConfiguration.DefaultIndex;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace Nest.Tests.Integration.Reproduce`
`13`	`13`	`public class Reproduce1181Tests : IntegrationTests`
`14`	`14`	`{`
`15`	`15`	`[Test]`
	`16`	`+ [SkipVersion("0 - 1.3.9", "Filters aggregation added in ES 1.4")]`
`16`	`17`	`public void FiltersAggregationResponseNotReadToCompletion()`
`17`	`18`	`{`
`18`	`19`	`var result = this.Client.Search<ElasticsearchProject>(s => s`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace Nest.Tests.Integration.Search`
`11`	`11`	`public class TerminateAfterTests : IntegrationTests`
`12`	`12`	`{`
`13`	`13`	`[Test]`
	`14`	`+ [SkipVersion("0 - 1.3.9", "Terminate after added in ES 1.4")]`
`14`	`15`	`public void TerminatedEarlyIsSet()`
`15`	`16`	`{`
`16`	`17`	`var queryResults = this.Client.Search<ElasticsearchProject>(s=>s`