Update to Xunit 2.4.1

stevejgordon · stevejgordon · commit e23f16ee57b5 · 2021-12-24T14:47:56.000Z
diff --git a/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj b/examples/Elastic.Xunit.ExampleComplex/Elastic.Xunit.ExampleComplex.csproj
@@ -1,13 +1,16 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net5.0;net461</TargetFrameworks>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     
     <PackageReference Include="NEST" Version="6.0.1" />
     <PackageReference Include="FluentAssertions" Version="5.1.2" />
diff --git a/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj b/examples/Elastic.Xunit.ExampleMinimal/Elastic.Xunit.ExampleMinimal.csproj
@@ -1,13 +1,15 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net5.0;net461</TargetFrameworks>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />    
     <PackageReference Include="NEST" Version="6.0.1" />
     <PackageReference Include="FluentAssertions" Version="5.1.2" />
   </ItemGroup>
diff --git a/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj b/src/Elastic.Elasticsearch.Xunit/Elastic.Elasticsearch.Xunit.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
     <IsPackable>True</IsPackable>
     <Description>Provides an Xunit test framework allowing you to run integration tests against local ephemeral Elasticsearch clusters</Description>
     <PackageTags>elastic,elasticsearch,xunit,cluster,integration,test,ephemeral</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Elasticsearch.Ephemeral\Elastic.Elasticsearch.Ephemeral.csproj" />
diff --git a/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/ElasticTestCaseDiscoverer.cs b/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/ElasticTestCaseDiscoverer.cs
@@ -30,7 +30,7 @@ public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions disco
 					: new IXunitTestCase[] {new SkippingTestCase(skipReason, testMethod, null)}
 				: new[]
 				{
-					new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod)
+					new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod)
 				};
 
 		/// <summary>
diff --git a/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/IntegrationTestDiscoverer.cs b/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/IntegrationTestDiscoverer.cs
@@ -75,8 +75,8 @@ protected override bool SkipMethod(ITestFrameworkDiscoveryOptions discoveryOptio
 			if (skipVersionAttribute != null)
 			{
 				var skipVersionRanges =
-					skipVersionAttribute.GetNamedArgument<IList<Range>>(nameof(SkipVersionAttribute.Ranges)) ??
-					new List<Range>();
+					skipVersionAttribute.GetNamedArgument<IList<SemVer.Range>>(nameof(SkipVersionAttribute.Ranges)) ??
+					new List<SemVer.Range>();
 				if (elasticsearchVersion == null && skipVersionRanges.Count > 0)
 				{
 					skipReason = $"{nameof(SkipVersionAttribute)} has ranges defined for this test but " +
diff --git a/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/SkipVersionAttribute.cs b/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/SkipVersionAttribute.cs
@@ -20,11 +20,11 @@ public SkipVersionAttribute(string skipVersionRangesSeparatedByComma, string rea
 		{
 			Reason = reason;
 			Ranges = string.IsNullOrEmpty(skipVersionRangesSeparatedByComma)
-				? new List<Range>()
+				? new List<SemVer.Range>()
 				: skipVersionRangesSeparatedByComma.Split(',')
 					.Select(r => r.Trim())
 					.Where(r => !string.IsNullOrWhiteSpace(r))
-					.Select(r => new Range(r))
+					.Select(r => new SemVer.Range(r))
 					.ToList();
 		}
 
@@ -36,6 +36,6 @@ public SkipVersionAttribute(string skipVersionRangesSeparatedByComma, string rea
 		/// <summary>
 		///     The version ranges for which the test should be skipped
 		/// </summary>
-		public IList<Range> Ranges { get; }
+		public IList<SemVer.Range> Ranges { get; }
 	}
 }
diff --git a/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/SkippingTestCase.cs b/src/Elastic.Elasticsearch.Xunit/XunitPlumbing/SkippingTestCase.cs
@@ -22,9 +22,11 @@ public SkippingTestCase()
 		/// <param name="testMethod">The test method this test case belongs to.</param>
 		/// <param name="testMethodArguments">The arguments for the test method.</param>
 		public SkippingTestCase(string skipReason, ITestMethod testMethod, object[] testMethodArguments = null)
-			: base(TestMethodDisplay.ClassAndMethod, testMethod, testMethodArguments) =>
+			: base(TestMethodDisplay.ClassAndMethod, TestMethodDisplayOptions.None, testMethod, testMethodArguments) =>
 			SkipReason = skipReason ?? "skipped";
 
+		public int Timeout => 0;
+
 		/// <inheritdoc />
 		public Task<RunSummary> RunAsync(
 			IMessageSink diagnosticMessageSink,

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions disco`
`30`	`30`	`: new IXunitTestCase[] {new SkippingTestCase(skipReason, testMethod, null)}`
`31`	`31`	`: new[]`
`32`	`32`	`{`
`33`		`- new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod)`
	`33`	`+ new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod)`
`34`	`34`	`};`
`35`	`35`
`36`	`36`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ protected override bool SkipMethod(ITestFrameworkDiscoveryOptions discoveryOptio`
`75`	`75`	`if (skipVersionAttribute != null)`
`76`	`76`	`{`
`77`	`77`	`var skipVersionRanges =`
`78`		`- skipVersionAttribute.GetNamedArgument<IList<Range>>(nameof(SkipVersionAttribute.Ranges)) ??`
`79`		`- new List<Range>();`
	`78`	`+ skipVersionAttribute.GetNamedArgument<IList<SemVer.Range>>(nameof(SkipVersionAttribute.Ranges)) ??`
	`79`	`+ new List<SemVer.Range>();`
`80`	`80`	`if (elasticsearchVersion == null && skipVersionRanges.Count > 0)`
`81`	`81`	`{`
`82`	`82`	`skipReason = $"{nameof(SkipVersionAttribute)} has ranges defined for this test but " +`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ public SkipVersionAttribute(string skipVersionRangesSeparatedByComma, string rea`
`20`	`20`	`{`
`21`	`21`	`Reason = reason;`
`22`	`22`	`Ranges = string.IsNullOrEmpty(skipVersionRangesSeparatedByComma)`
`23`		`- ? new List<Range>()`
	`23`	`+ ? new List<SemVer.Range>()`
`24`	`24`	`: skipVersionRangesSeparatedByComma.Split(',')`
`25`	`25`	`.Select(r => r.Trim())`
`26`	`26`	`.Where(r => !string.IsNullOrWhiteSpace(r))`
`27`		`- .Select(r => new Range(r))`
	`27`	`+ .Select(r => new SemVer.Range(r))`
`28`	`28`	`.ToList();`
`29`	`29`	`}`
`30`	`30`
`@@ -36,6 +36,6 @@ public SkipVersionAttribute(string skipVersionRangesSeparatedByComma, string rea`
`36`	`36`	`/// <summary>`
`37`	`37`	`/// The version ranges for which the test should be skipped`
`38`	`38`	`/// </summary>`
`39`		`- public IList<Range> Ranges { get; }`
	`39`	`+ public IList<SemVer.Range> Ranges { get; }`
`40`	`40`	`}`
`41`	`41`	`}`