Skip to content

Commit ae2b5c8

Browse files
bgraingerbgrainger
committed
Update to Xunit 2.4.2.
Replace Xunit.SkippableFact with built-in functionality.
1 parent b83c306 commit ae2b5c8

File tree

23 files changed

+1679
-1675
lines changed

23 files changed

+1679
-1675
lines changed

‎src/AdoNet.Specification.Tests/AdoNet.Specification.Tests.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="xunit" Version="2.4.1" />
32-
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
33-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
31+
<PackageReference Include="xunit" Version="2.4.2" />
32+
<PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
3433
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
3534
</ItemGroup>
3635

‎src/AdoNet.Specification.Tests/DbProviderFactoryTestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ protected DbProviderFactoryTestBase(TFixture fixture)
4444
public virtual void DbProviderFactory_CanCreateDataSourceEnumerator_is_accurate() => Assert.Equal(Fixture.Factory.CanCreateDataSourceEnumerator, Fixture.Factory.CreateDataSourceEnumerator() is object);
4545

4646
#if NETSTANDARD2_0
47-
[SkippableFact]
47+
[Fact]
4848
public virtual void DbProviderFactory_CanCreateCommandBuilder_is_true() => throw new SkipException("Not supported on this TargetFramework");
4949

50-
[SkippableFact]
50+
[Fact]
5151
public virtual void DbProviderFactory_CanCreateDataAdapter_is_true() => throw new SkipException("Not supported on this TargetFramework");
5252
#else
5353
[Fact]

‎src/AdoNet.Specification.Tests/GetValueConversionTestBase.g.cs

Lines changed: 1649 additions & 1649 deletions
Large diffs are not rendered by default.

‎src/AdoNetApiTest/Program.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,12 @@ private static IReadOnlyDictionary<string, TestResult> CreateTestResults(XDocume
241241
var failure = test.Element(teamTest + "Output").Element(teamTest + "ErrorInfo");
242242
var message = ((string) failure.Element(teamTest + "Message")).Replace("\\r\\n", "\n");
243243

244-
if (message.StartsWith("AdoNet.Specification.Tests.UnexpectedValueException :", StringComparison.Ordinal))
244+
if (message.StartsWith("$XunitDynamicSkip$", StringComparison.Ordinal))
245+
{
246+
testMessage = message.Replace("$XunitDynamicSkip$", "");
247+
testStatus = TestStatus.NotApplicable;
248+
}
249+
else if (message.StartsWith("AdoNet.Specification.Tests.UnexpectedValueException :", StringComparison.Ordinal))
245250
{
246251
testStatus = TestStatus.Fail;
247252
testMessage = message.Replace("AdoNet.Specification.Tests.UnexpectedValueException : ", "");

‎tests/DotConnectMySql.Tests/DotConnectMySql.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="dotConnect.Express.for.MySQL" Version="*" />
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
1010
<PackageReference Include="System.Runtime" Version="4.3.1" />
11-
<PackageReference Include="xunit" Version="2.4.1" />
11+
<PackageReference Include="xunit" Version="2.4.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1313
</ItemGroup>
1414

‎tests/DotConnectPostgres.Tests/DotConnectPostgres.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="dotConnect.Express.for.PostgreSQL" Version="*" />
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
1010
<PackageReference Include="System.Runtime" Version="4.3.1" />
11-
<PackageReference Include="xunit" Version="2.4.1" />
11+
<PackageReference Include="xunit" Version="2.4.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1313
</ItemGroup>
1414

‎tests/FaithlifeSqlite.Tests/FaithlifeSqlite.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
1010
<PackageReference Include="sqlite" Version="3.13.0" />
1111
<PackageReference Include="System.Runtime" Version="4.3.1" />
12-
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="xunit" Version="2.4.2" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1414
</ItemGroup>
1515

‎tests/MicrosoftSqlClient.Tests/MicrosoftSqlClient.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
99
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.*" />
10-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="xunit" Version="2.4.2" />
1111
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1212
</ItemGroup>
1313

‎tests/MicrosoftSqlClient2.Tests/MicrosoftSqlClient2.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
99
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.*" />
10-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="xunit" Version="2.4.2" />
1111
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1212
</ItemGroup>
1313

‎tests/MicrosoftSqlClient3.Tests/MicrosoftSqlClient3.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
99
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.*" />
10-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="xunit" Version="2.4.2" />
1111
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1212
</ItemGroup>
1313

0 commit comments

Comments
 (0)