fix #402 TermsExecution Enum was missing some members

Author: Mpdreamz

.gitignore

@@ -42,3 +42,4 @@ build/keys/keypair.snk
 /dep/Newtonsoft.Json.4.0.2
 
 /src/Nest.Tests.Unit/*.ncrunchproject
+*.ncrunchproject

src/Nest.Tests.Integration/Mapping/MapTests.cs

@@ -49,12 +49,14 @@ private void TestMapping(RootObjectMapping typeMapping)
 		[Test]
 		public void SimpleMapByAttributes()
 		{
-			this._client.DeleteMapping<ElasticSearchProject>();
-			this._client.DeleteMapping<ElasticSearchProject>(ElasticsearchConfiguration.DefaultIndex + "_clone");
-			var x = this._client.MapFromAttributes<ElasticSearchProject>();
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
+			var x = this._client.CreateIndex(index, s => s
+				.AddMapping<ElasticSearchProject>(m => m.MapFromAttributes())
+			);
+			Assert.IsTrue(x.OK, x.ConnectionStatus.ToString());
 			Assert.IsTrue(x.OK);
 
-			var typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex, "elasticsearchprojects");
+			var typeMapping = this._client.GetMapping(index, "elasticsearchprojects");
 			TestMapping(typeMapping);
 		}
 
@@ -64,13 +66,15 @@ public void SimpleMapByAttributes()
 		[Test]
 		public void SimpleMapByAttributesUsingType()
 		{
-			var t = typeof(ElasticSearchProject);
-			this._client.DeleteMapping(t);
-			this._client.DeleteMapping(t, ElasticsearchConfiguration.DefaultIndex + "_clone");
-			var x = this._client.MapFromAttributes(t);
-			Assert.IsTrue(x.OK);
-
-			var typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex, "elasticsearchprojects");
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
+			var x = this._client.CreateIndex(index, s => s
+				
+			);
+			Assert.IsTrue(x.OK, x.ConnectionStatus.ToString());
+			var xx = this._client.MapFromAttributes(typeof(ElasticSearchProject), index);
+			Assert.IsTrue(xx.OK);
+
+			var typeMapping = this._client.GetMapping(index, "elasticsearchprojects");
 			TestMapping(typeMapping);
 		}
 
@@ -95,15 +99,17 @@ public void GetMappingOnNonExistingIndexType()
 		[Test]
 		public void DynamicMap()
 		{
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
+			var x = this._client.CreateIndex(index, s => s);
+			Assert.IsTrue(x.OK, x.ConnectionStatus.ToString());
 			var typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex, "elasticsearchprojects");
 			var mapping = typeMapping.Properties["country"] as StringMapping;
 			Assert.NotNull(mapping);
 			mapping.Boost = 3;
 			typeMapping.TypeNameMarker = "elasticsearchprojects2";
-			this._client.Map(typeMapping, ElasticsearchConfiguration.DefaultIndex + "_clone");
+			this._client.Map(typeMapping, index);
 
-			typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex + "_clone",
-												  "elasticsearchprojects2");
+			typeMapping = this._client.GetMapping(index, "elasticsearchprojects2");
 			var countryMapping = typeMapping.Properties["country"] as StringMapping;
 			Assert.NotNull(countryMapping);
 			Assert.AreEqual(3, countryMapping.Boost);

src/Nest.Tests.Integration/Mapping/NotAnalyzedTest.cs

@@ -10,24 +10,25 @@ public class NotAnalyzedTests : IntegrationTests
 		[Test]
 		public void NotAnalyzedReturnsOneItem()
 		{
-			this._client.DeleteMapping<ElasticSearchProject>();
-			this._client.DeleteMapping<ElasticSearchProject>(ElasticsearchConfiguration.DefaultIndex + "_clone");
-			this._client.CreateIndex(ElasticsearchConfiguration.DefaultIndex, new IndexSettings());
-			var x = this._client.MapFromAttributes<ElasticSearchProject>();
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
+			var x = this._client.CreateIndex(index, s => s
+				.AddMapping<ElasticSearchProject>(m=>m.MapFromAttributes())
+			);
 			Assert.IsTrue(x.OK, x.ConnectionStatus.ToString());
 
-			var typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex, "elasticsearchprojects");
+			var typeMapping = this._client.GetMapping(index, "elasticsearchprojects");
 			var mapping = typeMapping.Properties["country"] as StringMapping;
 			Assert.NotNull(mapping);
 			Assert.AreEqual(FieldIndexOption.not_analyzed, mapping.Index);
 
 			var indexResult = this._client.Index(new ElasticSearchProject
 			{
 				Country = "The Royal Kingdom Of The Netherlands"
-			}, new IndexParameters { Refresh = true });
+			}, indexParameters: new IndexParameters { Refresh = true }, index: index);
 			Assert.IsTrue(indexResult.IsValid);
 
 			var result = this._client.Search<ElasticSearchProject>(s=>s
+				.Index(index)
 				.FacetTerm(ft=>ft.OnField(f=>f.Country))
 				.MatchAll()
 			);
@@ -37,27 +38,30 @@ public void NotAnalyzedReturnsOneItem()
 		}
 
 		[Test]
-		public void AnalyzedReturnsTwoItems()
+		public void AnalyzedReturnsMoreItems()
 		{
-			this._client.DeleteMapping<ElasticSearchProject>();
-			var x = this._client.MapFromAttributes<ElasticSearchProject>();
-			Assert.IsTrue(x.OK);
-
-			var typeMapping = this._client.GetMapping(ElasticsearchConfiguration.DefaultIndex, "elasticsearchprojects");
-			this._client.DeleteMapping<ElasticSearchProject>();
-			var mapping = typeMapping.Properties["country"] as StringMapping;
-			Assert.NotNull(mapping);
-			mapping.Index = FieldIndexOption.analyzed;
-			var updateMapResult = this._client.Map(typeMapping);
-			Assert.True(updateMapResult.IsValid);
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
+			var x = this._client.CreateIndex(index, s => s
+				.AddMapping<ElasticSearchProject>(m => m
+					.MapFromAttributes()
+					.Properties(pp=>pp
+						.String(pps=>pps.Name(p=>p.Country).Index(FieldIndexOption.analyzed))
+					)
+				)
+			);
+			Assert.IsTrue(x.OK, x.ConnectionStatus.ToString());
 
-			var indexResult = this._client.Index(new ElasticSearchProject
-			{
-				Country = "The Royal Kingdom Of The Netherlands"
-			}, new IndexParameters { Refresh = true });
+			var indexResult = this._client.Index(
+				new ElasticSearchProject
+				{
+					Country = "The Royal Kingdom Of The Netherlands"
+				},
+				indexParameters: new IndexParameters { Refresh = true }
+				, index: index);
 			Assert.IsTrue(indexResult.IsValid);
 
 			var result = this._client.Search<ElasticSearchProject>(s => s
+				.Index(index)
 				.FacetTerm(ft => ft.OnField(f => f.Country))
 				.MatchAll()
 			);

src/Nest.Tests.Integration/Warmers/IndicesWarmersTests.cs

@@ -14,9 +14,7 @@ public class IndicesWarmersTests : IntegrationTests
 		[Test]
 		public void CreateIndexWithWarmer()
 		{
-			var index = ElasticsearchConfiguration.DefaultIndex + "_clone";
-			if (this._client.IndexExists(index).Exists)
-				this._client.DeleteIndex(index);
+			var index = ElasticsearchConfiguration.NewUniqueIndexName();
 
 			var result = this._client.CreateIndex(index, c => c
 				.NumberOfReplicas(0)

src/Nest/Enums/TermsExecution.cs

@@ -8,10 +8,12 @@
 
 namespace Nest
 {
-  public enum TermsExecution
-  {
-   plain,
-   @bool,
-   and
-  }
+	public enum TermsExecution
+	{
+		plain,
+		@bool,
+		and,
+		or,
+		fielddata
+	}
 }