Fixes Rider live test discovery see: https://youtrack.jetbrains.com/issue/RIDER-19912

By duplicating tests of base classes in intermediate base classes

Author: Mpdreamz

src/Tests/Tests.Core/Tests.Core.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tests.Domain\Tests.Domain.csproj" />
-    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20180810T103700" />
+    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20180902T153954" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="FluentAssertions" Version="4.19.2" />

src/Tests/Tests.Domain/Tests.Domain.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bogus" Version="22.1.2" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20180810T103700" />
+    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20180902T153954" />
     <ProjectReference Include="..\Tests.Configuration\Tests.Configuration.csproj" />
   </ItemGroup>
 </Project>

src/Tests/Tests/Aggregations/AggregationUsageTestBase.cs

@@ -1,4 +1,6 @@
-using Elasticsearch.Net;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Client;
 using Tests.Core.ManagedElasticsearch.Clusters;
@@ -24,6 +26,13 @@ protected override LazyResponses ClientUsage() => Calls(
 			requestAsync: (client, r) => client.SearchAsync<Project>(r)
 		);
 
+		// Fixes Rider live test discovery see: https://youtrack.jetbrains.com/issue/RIDER-19912
+		[I] public override Task HandlesStatusCode() => base.HandlesStatusCode();
+
+		[I] public override Task ReturnsExpectedIsValid() => base.ReturnsExpectedIsValid();
+
+		[I] public override Task ReturnsExpectedResponse() => base.ReturnsExpectedResponse();
+
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;

src/Tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs

@@ -34,13 +34,13 @@ protected ApiIntegrationTestBase(TCluster cluster, EndpointUsage usage) : base(c
 
 		protected override IElasticClient Client => this.Cluster.Client;
 
-		[I] public async Task HandlesStatusCode() =>
+		[I] public async virtual Task HandlesStatusCode() =>
 			await this.AssertOnAllResponses(r => r.ApiCall.HttpStatusCode.Should().Be(this.ExpectStatusCode));
 
-		[I] public async Task ReturnsExpectedIsValid() =>
+		[I] public async virtual Task ReturnsExpectedIsValid() =>
 			await this.AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(this.ExpectIsValid));
 
-		[I] public async Task ReturnsExpectedResponse() => await this.AssertOnAllResponses(ExpectResponse);
+		[I] public async virtual Task ReturnsExpectedResponse() => await this.AssertOnAllResponses(ExpectResponse);
 
 		protected override Task AssertOnAllResponses(Action<TResponse> assert)
 		{

src/Tests/Tests/IndexModules/UsageTestBase.cs

@@ -20,12 +20,12 @@ public abstract class UsageTestBase<TInterface, TDescriptor, TInitializer> : Exp
 		protected UsageTestBase() : base(TestClient.DefaultInMemoryClient) =>
 			this.FluentInstance = this.Fluent(new TDescriptor());
 
-		[U] protected void SerializesInitializer()
+		[U] protected virtual void SerializesInitializer()
 		{
 			if (this.TestObjectInitializer) this.RoundTripsOrSerializes<TInterface>(this.Initializer);
 		}
 
-		[U] protected void SerializesFluent() => this.RoundTripsOrSerializes(this.FluentInstance);
+		[U] protected virtual void SerializesFluent() => this.RoundTripsOrSerializes(this.FluentInstance);
 	}
 
 	public abstract class PromiseUsageTestBase<TInterface, TDescriptor, TInitializer> : ExpectJsonTestBase

src/Tests/Tests/Search/Request/PostFilterUsageTests.cs

@@ -5,9 +5,7 @@
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
-using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.ManagedElasticsearch.Clusters;
 
 namespace Tests.Search.Request
 {

src/Tests/Tests/Search/SearchUsageTestBase.cs

@@ -1,4 +1,6 @@
-using Elasticsearch.Net;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
+using Elasticsearch.Net;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -24,5 +26,12 @@ protected override LazyResponses ClientUsage() => Calls(
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override string UrlPath => "/project/project/_search";
 
+		// Fixes Rider live test discovery see: https://youtrack.jetbrains.com/issue/RIDER-19912
+		[I] public override Task HandlesStatusCode() => base.HandlesStatusCode();
+
+		[I] public override Task ReturnsExpectedIsValid() => base.ReturnsExpectedIsValid();
+
+		[I] public override Task ReturnsExpectedResponse() => base.ReturnsExpectedResponse();
+
 	}
 }

src/Tests/Tests/XunitBootstrap.cs

@@ -1,6 +1,5 @@
 using Elastic.Xunit;
 using Tests.Core.Xunit;
-using Tests.Framework.ManagedElasticsearch;
 
 [assembly: Xunit.TestFrameworkAttribute("Elastic.Xunit.Sdk.ElasticTestFramework", "Elastic.Xunit")]
 [assembly: ElasticXunitConfiguration(typeof(NestXunitRunOptions))]