Post build and test fixes cherrypick fixes

build/scripts/Testing.fsx

@@ -7,17 +7,23 @@ open System.IO
 open Fake 
 open Paths
 open Projects
+open Tooling
 
 module Tests = 
     let private testProjectJson parallelization =
-        let p = Paths.Source "Tests/project.json"
-        Tooling.DotNet.Exec ["restore"; p;]
-        Tooling.DotNet.Exec ["test"; p; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Core-Clr.xml")]
+        DotNetProject.AllPublishable
+        |> Seq.iter(fun p -> 
+            let path = Paths.ProjectJson p.Name
+            DotNet.Exec ["restore"; path; "--verbosity Warning"]
+        )
+
+        let testPath = Paths.Source "Tests/project.json"
+        DotNet.Exec ["test"; testPath; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Core-Clr.xml")]
 
     let private testDesktopClr parallelization = 
         let folder = Paths.ProjectOutputFolder (PrivateProject PrivateProject.Tests) DotNetFramework.Net46
         let testDll = Path.Combine(folder, "Tests.dll")
-        Tooling.XUnit.Exec [testDll; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Desktop-Clr.xml")] 
+        XUnit.Exec [testDll; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Desktop-Clr.xml")] 
         |> ignore
 
 

paket.lock

@@ -247,7 +247,6 @@ NUGET
     runtime.native.System.Security.Cryptography (4.0) - framework: >= netstandard13
       Microsoft.NETCore.Platforms (>= 1.0.1)
       Microsoft.NETCore.Targets (>= 1.0.1)
-    SemanticVersioning (0.6.17)
     ShellProgressBar (3.0)
     System.AppContext (4.1) - framework: >= netstandard13
       System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15

src/Benchmarking/Benchmarking.csproj

@@ -1290,7 +1290,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0')">
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0')">
       <ItemGroup>
         <Reference Include="System.Threading.Thread">
           <HintPath>..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll</HintPath>
@@ -1362,4 +1362,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -64,7 +64,6 @@
     <Compile Include="Overrides\Descriptors\ClearCacheDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCachedRealmsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCachedRolesDescriptorOverrides.cs" />
-    <Compile Include="Overrides\Descriptors\DeleteWarmerDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\DescriptorOverridesBase.cs" />
     <Compile Include="Overrides\Descriptors\FieldStatsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\GraphExploreDescriptorOverrides.cs" />
@@ -960,4 +959,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>

src/Profiling/Profiling.csproj

@@ -136,7 +136,6 @@
     <Compile Include="Async\ScrollAsync.cs" />
     <Compile Include="Async\SearchAsync.cs" />
     <Compile Include="Async\SearchAsyncOperation.cs" />
-    <Compile Include="Async\SearchExistsAsync.cs" />
     <Compile Include="Async\SearchShardsAsync.cs" />
     <Compile Include="Async\SearchTemplateAsync.cs" />
     <Compile Include="Async\SegmentsAsync.cs" />
@@ -1503,7 +1502,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0')">
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0')">
       <ItemGroup>
         <Reference Include="System.Threading.Thread">
           <HintPath>..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll</HintPath>

src/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs

@@ -1,6 +1,7 @@
 using System;
 using FluentAssertions;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 using static Nest.Infer;

src/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs

@@ -1,6 +1,7 @@
 using System;
 using FluentAssertions;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 using Xunit;

src/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs

@@ -1,6 +1,7 @@
 using System;
 using FluentAssertions;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 

src/Tests/Aggregations/Pipeline/PercentilesBucket/PercentilesBucketAggregationUsageTests.cs

@@ -1,6 +1,7 @@
 using System;
 using FluentAssertions;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 

src/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs

@@ -1,6 +1,7 @@
 using System;
 using FluentAssertions;
 using Nest;
+using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 

src/Tests/Cat/CatHealth/CatHealthApiTests.cs

@@ -29,8 +29,7 @@ protected override void ExpectResponse(ICatResponse<CatHealthRecord> response)
 		}
 	}
 
-	[Collection(TypeOfCluster.ReadOnly)]
-	public class CatHealthNoTimestampApiTests : ApiIntegrationTestBase<ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
+	public class CatHealthNoTimestampApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatHealthRecord>, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest>
 	{
 		public CatHealthNoTimestampApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 		protected override LazyResponses ClientUsage() => Calls(

src/Tests/Cat/CatTasks/CatTasksApiTests.cs

@@ -6,8 +6,7 @@
 
 namespace Tests.Cat.CatTasks
 {
-	[Collection(TypeOfCluster.ReadOnly)]
-	public class CatTasksApiTests : ApiIntegrationTestBase<ICatResponse<CatTasksRecord>, ICatTasksRequest, CatTasksDescriptor, CatTasksRequest>
+	public class CatTasksApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTasksRecord>, ICatTasksRequest, CatTasksDescriptor, CatTasksRequest>
 	{
 		public CatTasksApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 		protected override LazyResponses ClientUsage() => Calls(

src/Tests/ClientConcepts/Exceptions/ExceptionTests.cs

@@ -21,7 +21,7 @@ public ExceptionTests(WritableCluster cluster)
 		//[I]
 		public void ServerTestWhenThrowExceptionsEnabled()
 		{
-			var settings = new ConnectionSettings(TestClient.CreateNode(_port))
+			var settings = new ConnectionSettings(TestClient.CreateUri(_port))
 				.ThrowExceptions();
 			var client = new ElasticClient(settings);
 			var exception = Assert.Throws<ElasticsearchClientException>(() => client.GetMapping<Project>(s => s.Index("doesntexist")));
@@ -55,7 +55,7 @@ public void ClientTestWhenThrowExceptionsEnabled()
 		//[I]
 		public void ServerTestWhenThrowExceptionsDisabled()
 		{
-			var settings = new ConnectionSettings(TestClient.CreateNode(_port));
+			var settings = new ConnectionSettings(TestClient.CreateUri(_port));
 			var client = new ElasticClient(settings);
 			var response = client.GetMapping<Project>(s => s.Index("doesntexist"));
 #if DOTNETCORE

src/Tests/ClientConcepts/HighLevel/Inference/IndicesPaths.doc.cs

@@ -54,8 +54,12 @@ [U] public void ImplicitConversionFromString()
 		*/
 		[U] public void UsingStaticPropertyField()
 		{
+
 			var client = TestClient.Default;
 
+			var singleString = Index("name1"); // <1> specifying a single index using a string
+			var singleTyped = Index<Project>(); //<2> specifying a single index using a type
+
 			ISearchRequest singleStringRequest = new SearchDescriptor<Project>().Index(singleString);
 			ISearchRequest singleTypedRequest = new SearchDescriptor<Project>().Index(singleTyped);
 

src/Tests/ClientConcepts/HighLevel/Inference/PropertyInference.doc.cs

@@ -13,14 +13,9 @@ namespace Tests.ClientConcepts.HighLevel.Inference
 	/**[[property-inference]]
 	* == Property Name Inference
 	*/
-	public class PropertyNames : SimpleIntegration, IClusterFixture<WritableCluster>
+	public class PropertyNames : IntegrationDocumentationTestBase , IClusterFixture<WritableCluster>
 	{
-		public PropertyNames(IndexingCluster cluster) : base(cluster) { }
-
-		public PropertyNames(WritableCluster cluster) : base(cluster)
-		{
-			_client = cluster.Client;
-		}
+		public PropertyNames(WritableCluster cluster) : base(cluster) { }
 
 		/**=== Appending suffixes to a Lambda expression body
 		 * Suffixes can be appended to the body of a lambda expression, useful in cases where

src/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs

@@ -9,8 +9,7 @@
 
 namespace Tests.Cluster.ClusterAllocationExplain
 {
-	[Collection(TypeOfCluster.ReadOnly)]
-	public class ClusterAllocationExplainApiTests : ApiIntegrationTestBase<IClusterAllocationExplainResponse, IClusterAllocationExplainRequest, ClusterAllocationExplainDescriptor, ClusterAllocationExplainRequest>
+	public class ClusterAllocationExplainApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IClusterAllocationExplainResponse, IClusterAllocationExplainRequest, ClusterAllocationExplainDescriptor, ClusterAllocationExplainRequest>
 	{
 		public ClusterAllocationExplainApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 		protected override LazyResponses ClientUsage() => Calls(

src/Tests/Document/Multiple/BulkAll/BulkAllApiTests.cs

@@ -11,8 +11,7 @@
 
 namespace Tests.Document.Multiple.BulkAll
 {
-	[Collection(TypeOfCluster.Indexing)]
-	public class BulkAllApiTests : SerializationTestBase
+	public class BulkAllApiTests : SerializationTestBase, IClusterFixture<WritableCluster>
 	{
 		private class SmallObject
 		{
@@ -29,9 +28,9 @@ private IEnumerable<SmallObject> CreateLazyStreamOfDocuments(int count)
 				yield return new SmallObject() { Id = i };
 		}
 
-		public BulkAllApiTests(IndexingCluster cluster, EndpointUsage usage)
+		public BulkAllApiTests(WritableCluster cluster, EndpointUsage usage)
 		{
-			this._client = cluster.Client();
+			this._client = cluster.Client;
 		}
 
 		[I] public void ReturnsExpectedResponse()

src/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs

@@ -12,9 +12,9 @@
 
 namespace Tests.Document.Multiple.DeleteByQuery
 {
-	public class DeleteByQueryApiTests : ApiIntegrationTestBase<WritableCluster, IDeleteByQueryResponse, IDeleteByQueryRequest, DeleteByQueryDescriptor<Project>, DeleteByQueryRequest>
+	public class DeleteByQueryApiTests : ApiIntegrationTestBase<IntrusiveOperationCluster, IDeleteByQueryResponse, IDeleteByQueryRequest, DeleteByQueryDescriptor<Project>, DeleteByQueryRequest>
 	{
-		public DeleteByQueryApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public DeleteByQueryApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
@@ -99,10 +99,9 @@ protected override void ExpectResponse(IDeleteByQueryResponse response)
 	}
 
 
-	[Collection(TypeOfCluster.OwnIndex)]
 	public class DeleteByQueryWaitForCompletionApiTests : DeleteByQueryApiTests
 	{
-		public DeleteByQueryWaitForCompletionApiTests(OwnIndexCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public DeleteByQueryWaitForCompletionApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override string UrlPath => $"/{CallIsolatedValue}/project/_delete_by_query?wait_for_completion=false&conflicts=proceed";
 
@@ -130,10 +129,9 @@ protected override void ExpectResponse(IDeleteByQueryResponse response)
 		}
 	}
 
-	[Collection(TypeOfCluster.OwnIndex)]
 	public class DeleteByQueryWithFailuresApiTests : DeleteByQueryApiTests
 	{
-		public DeleteByQueryWithFailuresApiTests(OwnIndexCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public DeleteByQueryWithFailuresApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{

src/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs

@@ -114,33 +114,5 @@ protected override void ExpectResponse(IMultiTermVectorsResponse response)
 					}
 				})
 		};
-
-		protected override void ExpectResponse(IMultiTermVectorsResponse response)
-		{
-			response.IsValid.Should().BeTrue();
-			response.Documents.Should().NotBeEmpty().And.HaveCount(2).And.OnlyContain(d => d.Found);
-			var termvectorDoc = response.Documents.FirstOrDefault(d => d.TermVectors.Count > 0);
-
-			termvectorDoc.Should().NotBeNull();
-			termvectorDoc.Index.Should().NotBeNull();
-			termvectorDoc.Type.Should().NotBeNull();
-			termvectorDoc.Id.Should().NotBeNull();
-
-			termvectorDoc.TermVectors.Should().NotBeEmpty().And.ContainKey("firstName");
-			var vectors = termvectorDoc.TermVectors["firstName"];
-			vectors.Terms.Should().NotBeEmpty();
-			foreach (var vectorTerm in vectors.Terms)
-			{
-				vectorTerm.Key.Should().NotBeNullOrWhiteSpace();
-				vectorTerm.Value.Should().NotBeNull();
-				vectorTerm.Value.TermFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.DocumentFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.TotalTermFrequency.Should().BeGreaterThan(0);
-				vectorTerm.Value.Tokens.Should().NotBeEmpty();
-
-				var token = vectorTerm.Value.Tokens.First();
-				token.EndOffset.Should().BeGreaterThan(0);
-			}
-		}
 	}
 }

src/Tests/Document/Multiple/Reindex/ReindexApiTests.cs

@@ -100,29 +100,6 @@ public void ReturnsExpectedResponse()
 				onCompleted: () => ReindexSingleTypeCompleted(handles)
 			);
 
-						var searchResult = this._client.Search<CommitActivity>(s => s
-							.Index(NewManyTypesIndexName)
-							.From(0)
-							.Size(100)
-							.Query(q => q.MatchAll())
-							.SearchType(SearchType.Scan)
-							.Scroll(scroll)
-						);
-
-						do
-						{
-							var result = searchResult;
-							searchResult = this._client.Scroll<CommitActivity>(scroll, result.ScrollId);
-							foreach (var hit in searchResult.Hits)
-							{
-								hit.Timestamp.Should().HaveValue();
-								hit.Parent.Should().NotBeNullOrEmpty();
-								hit.Routing.Should().NotBeNullOrEmpty();
-							}
-						} while (searchResult.IsValid && searchResult.Documents.Any());
-						handles[0].Set();
-					}
-				);
 
 			WaitHandle.WaitAll(handles, TimeSpan.FromMinutes(3));
 		}

src/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs

@@ -14,7 +14,6 @@
 
 namespace Tests.Document.Multiple.ReindexRethrottle
 {
-	[Collection(TypeOfCluster.Reindex)]
 	public class ReindexRethrottleReindexApiTests : ReindexRethrottleApiTests
 	{
 		public ReindexRethrottleReindexApiTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage)
@@ -41,7 +40,6 @@ protected override void OnBeforeCall(IElasticClient client)
 		}
 	}
 
-	[Collection(TypeOfCluster.Reindex)]
 	public class ReindexRethrottleUpdateByQueryTests : ReindexRethrottleApiTests
 	{
 		public ReindexRethrottleUpdateByQueryTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage)
@@ -65,7 +63,7 @@ protected override void OnBeforeCall(IElasticClient client)
 	}
 
 	public abstract class ReindexRethrottleApiTests
-		: ApiIntegrationTestBase<IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor, ReindexRethrottleRequest>
+		: ApiIntegrationTestBase<ReindexCluster, IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor, ReindexRethrottleRequest>
 	{
 		protected TaskId TaskId => this.RanIntegrationSetup ? this.ExtendedValue<TaskId>(TaskIdKey) : "foo:1";
 

src/Tests/Document/Single/Index/IndexApiTests.cs

@@ -74,11 +74,9 @@ protected override string UrlPath
 
 	}
 
-	public class IndexIntegrationTests : SimpleIntegration, IClusterFixture<WritableCluster>
+	public class IndexIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		public IndexIntegrationTests(WritableCluster cluster) : base(cluster)
-		{
-		}
+		public IndexIntegrationTests(WritableCluster cluster) : base(cluster) { }
 
 		[I]
 		public void OpTypeCreate()
@@ -129,11 +127,9 @@ public void Index()
 		}
 	}
 
-	public class IndexJObjectIntegrationTests : SimpleIntegration, IClusterFixture<WritableCluster>
+	public class IndexJObjectIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
-		public IndexJObjectIntegrationTests(WritableCluster cluster) : base(cluster)
-		{
-		}
+		public IndexJObjectIntegrationTests(WritableCluster cluster) : base(cluster) { }
 
 		[I]
 		public void Index()
@@ -185,7 +181,7 @@ public void Index()
 		}
 	}
 
-	public class IndexAnonymousTypesIntegrationTests : SimpleIntegration, IClusterFixture<WritableCluster>
+	public class IndexAnonymousTypesIntegrationTests : IntegrationDocumentationTestBase, IClusterFixture<WritableCluster>
 	{
 		public IndexAnonymousTypesIntegrationTests(WritableCluster cluster) : base(cluster) { }