Skip to content

Commit 2d60145

Browse files
BorisDogBorisDog
authored
CSHARP-4400: Upgrade xunit to 2.4.2 and remove SkippableFact package (#935)
1 parent d37273e commit 2d60145

File tree

389 files changed

+1500
-1469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+1500
-1469
lines changed

‎CSharpDriver.sln‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D2012971-32B
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E472BDF5-61F1-461D-872B-9F53BB3ACA80}"
1212
ProjectSection(SolutionItems) = preProject
13-
tests\Directory.Build.props = tests\Directory.Build.props
13+
tests\BuildProps\Tests.Build.props = tests\BuildProps\Tests.Build.props
1414
EndProjectSection
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Bson", "src\MongoDB.Bson\MongoDB.Bson.csproj", "{9FCB42A5-3BC6-492B-8EA0-53EF32E9F8CD}"
@@ -54,8 +54,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
5454
MongoDBTest.ruleset = MongoDBTest.ruleset
5555
EndProjectSection
5656
EndProject
57-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkippableTests", "tests\SkippableTests\SkippableTests.csproj", "{D198833A-6AC3-4327-8B02-5095455192D0}"
58-
EndProject
5957
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.TestConsoleApplication", "tests\MongoDB.Driver.TestConsoleApplication\MongoDB.Driver.TestConsoleApplication.csproj", "{2E5780D2-29A5-483C-9CA2-844F45A66D0C}"
6058
EndProject
6159
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AstrolabeWorkloadExecutor", "tests\AstrolabeWorkloadExecutor\AstrolabeWorkloadExecutor.csproj", "{B90F025F-89D3-436A-AD78-6AA304A6E240}"
@@ -64,6 +62,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.SmokeTests.S
6462
EndProject
6563
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SmokeTests", "SmokeTests", "{F64BF86A-1EF1-4596-84A6-6B4AB766CD77}"
6664
EndProject
65+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.TestHelpers", "tests\MongoDB.TestHelpers\MongoDB.TestHelpers.csproj", "{DF888021-744F-4A8B-9324-831DEFC48AB8}"
66+
EndProject
6767
Global
6868
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6969
Debug|Any CPU = Debug|Any CPU
@@ -134,10 +134,6 @@ Global
134134
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Debug|Any CPU.Build.0 = Debug|Any CPU
135135
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.ActiveCfg = Release|Any CPU
136136
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.Build.0 = Release|Any CPU
137-
{D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138-
{D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
139-
{D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
140-
{D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.Build.0 = Release|Any CPU
141137
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142138
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
143139
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -150,6 +146,10 @@ Global
150146
{B711A69F-A337-452C-95E1-A6B15C727CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
151147
{B711A69F-A337-452C-95E1-A6B15C727CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
152148
{B711A69F-A337-452C-95E1-A6B15C727CBA}.Release|Any CPU.Build.0 = Release|Any CPU
149+
{DF888021-744F-4A8B-9324-831DEFC48AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{DF888021-744F-4A8B-9324-831DEFC48AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{DF888021-744F-4A8B-9324-831DEFC48AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
152+
{DF888021-744F-4A8B-9324-831DEFC48AB8}.Release|Any CPU.Build.0 = Release|Any CPU
153153
EndGlobalSection
154154
GlobalSection(SolutionProperties) = preSolution
155155
HideSolutionNode = FALSE
@@ -171,11 +171,11 @@ Global
171171
{C50D554C-2771-4CC1-9B2C-BB17FB27F935} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
172172
{DAB8DFFD-0020-43B3-9C08-7723F5D68E90} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
173173
{7A015030-6329-4FAD-B6E3-CED5ED53019C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
174-
{D198833A-6AC3-4327-8B02-5095455192D0} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
175174
{2E5780D2-29A5-483C-9CA2-844F45A66D0C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
176175
{B90F025F-89D3-436A-AD78-6AA304A6E240} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
177176
{B711A69F-A337-452C-95E1-A6B15C727CBA} = {F64BF86A-1EF1-4596-84A6-6B4AB766CD77}
178177
{F64BF86A-1EF1-4596-84A6-6B4AB766CD77} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
178+
{DF888021-744F-4A8B-9324-831DEFC48AB8} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
179179
EndGlobalSection
180180
GlobalSection(ExtensibilityGlobals) = postSolution
181181
SolutionGuid = {24BEC44B-92B0-43AA-9B15-163459D0C098}

‎tests/BuildProps/Tests.Build.props‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<StandardTargetFrameworks Condition="'$(IsWindows)'=='true'">$(StandardTargetFrameworks);net472</StandardTargetFrameworks>
1313
<IsPackable>false</IsPackable>
1414
</PropertyGroup>
15-
15+
1616
<PropertyGroup>
1717
<LangVersion>10</LangVersion>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -40,13 +40,11 @@
4040
<DefineConstants>$(DefineConstants);MACOS</DefineConstants>
4141
</PropertyGroup>
4242

43-
4443
<ItemGroup>
4544
<PackageReference Include="FluentAssertions" Version="4.12.0" />
4645
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
4746
<PackageReference Include="Moq" Version="4.9.0" />
48-
<PackageReference Include="xunit" Version="2.4.0" />
49-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
47+
<PackageReference Include="xunit" Version="2.4.2" />
5048
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5149
</ItemGroup>
5250
</Project>

‎tests/MongoDB.Bson.TestHelpers/GuidModeValues.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* limitations under the License.
1414
*/
1515

16-
using MongoDB.Bson.TestHelpers.XunitExtensions;
1716
using System.Linq;
17+
using MongoDB.TestHelpers.XunitExtensions;
1818

1919
namespace MongoDB.Bson.TestHelpers
2020
{

‎tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<ItemGroup>
2020
<ProjectReference Include="..\..\src\MongoDB.Bson\MongoDB.Bson.csproj" />
21+
<ProjectReference Include="..\MongoDB.TestHelpers\MongoDB.TestHelpers.csproj" />
2122
</ItemGroup>
2223

2324
</Project>

‎tests/MongoDB.Bson.Tests/IO/ArrayElementNameAcceleratorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
using System;
1717
using MongoDB.Bson.IO;
18-
using MongoDB.Bson.TestHelpers.XunitExtensions;
18+
using MongoDB.TestHelpers.XunitExtensions;
1919
using Xunit;
2020

2121
namespace MongoDB.Bson.Tests.IO

‎tests/MongoDB.Bson.Tests/IO/BsonBinaryReaderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
using MongoDB.Bson.IO;
2222
using MongoDB.Bson.Serialization;
2323
using MongoDB.Bson.TestHelpers;
24-
using MongoDB.Bson.TestHelpers.XunitExtensions;
24+
using MongoDB.TestHelpers.XunitExtensions;
2525
using Xunit;
2626

2727
namespace MongoDB.Bson.Tests.IO
2828
{
2929
public class BsonBinaryReaderTests
3030
{
31-
[SkippableFact]
31+
[Fact]
3232
public void BsonBinaryReader_should_support_reading_more_than_2GB()
3333
{
3434
RequireEnvironment.Check().EnvironmentVariable("EXPLICIT");

‎tests/MongoDB.Bson.Tests/IO/BsonBinaryWriterTests.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
using System.Linq;
1919
using FluentAssertions;
2020
using MongoDB.Bson.IO;
21-
using MongoDB.Bson.TestHelpers;
2221
using MongoDB.Bson.TestHelpers.IO;
23-
using MongoDB.Bson.TestHelpers.XunitExtensions;
22+
using MongoDB.TestHelpers.XunitExtensions;
2423
using Xunit;
2524

2625
namespace MongoDB.Bson.Tests.IO
@@ -53,7 +52,7 @@ public void BsonBinaryWriter_should_support_writing_multiple_documents(
5352
}
5453
}
5554

56-
[SkippableFact]
55+
[Fact]
5756
public void BsonBinaryWriter_should_support_writing_more_than_2GB()
5857
{
5958
RequireProcess.Check().Bits(64);
@@ -78,7 +77,7 @@ public void BsonBinaryWriter_should_support_writing_more_than_2GB()
7877
}
7978
}
8079

81-
[SkippableFact]
80+
[Fact]
8281
public void BackpatchSize_should_throw_when_size_is_larger_than_2GB()
8382
{
8483
RequireProcess.Check().Bits(64);

‎tests/MongoDB.Bson.Tests/IO/BsonChunkPoolTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using System.Threading.Tasks;
2222
using FluentAssertions;
2323
using MongoDB.Bson.IO;
24-
using MongoDB.Bson.TestHelpers.XunitExtensions;
24+
using MongoDB.TestHelpers.XunitExtensions;
2525
using Xunit;
2626

2727
namespace MongoDB.Bson.Tests.IO

‎tests/MongoDB.Bson.Tests/IO/BsonDocumentReaderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using MongoDB.Bson.Serialization;
2020
using MongoDB.Bson.Serialization.Serializers;
2121
using MongoDB.Bson.TestHelpers;
22-
using MongoDB.Bson.TestHelpers.XunitExtensions;
22+
using MongoDB.TestHelpers.XunitExtensions;
2323
using Xunit;
2424

2525
namespace MongoDB.Bson.Tests.IO

‎tests/MongoDB.Bson.Tests/IO/BsonStreamAdapterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using System.Threading.Tasks;
2222
using FluentAssertions;
2323
using MongoDB.Bson.IO;
24-
using MongoDB.Bson.TestHelpers.XunitExtensions;
24+
using MongoDB.TestHelpers.XunitExtensions;
2525
using Moq;
2626
using Xunit;
2727

0 commit comments

Comments
 (0)