Skip to content

Commit 89056e8

Browse files
GillesTourreauGillesTourreau
committed
Migrate to xUnit v3.
1 parent f525115 commit 89056e8

File tree

15 files changed

+112
-121
lines changed

15 files changed

+112
-121
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
1010
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
1111
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1312
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.1.172" />
1413
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
15-
<PackageVersion Include="xunit" Version="2.9.3" />
16-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
14+
<PackageVersion Include="xunit.v3" Version="3.0.1" />
1715
</ItemGroup>
1816
</Project>

‎tests/Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
<!-- Imports the parent Directory.Build.props if exist -->
44
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
5+
6+
<!-- Common NuGet packages -->
7+
<ItemGroup>
8+
<PackageReference Include="coverlet.collector">
9+
<PrivateAssets>all</PrivateAssets>
10+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11+
</PackageReference>
12+
<PackageReference Include="FluentAssertions" />
13+
<PackageReference Include="xunit.v3" />
14+
</ItemGroup>
15+
16+
<!-- Add the support Microsoft Test Platform -->
17+
<PropertyGroup>
18+
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
19+
<TestingPlatformDotnetTestSupport>false</TestingPlatformDotnetTestSupport>
20+
</PropertyGroup>
521

622
<!-- Add the default using directive for all tests code -->
723
<ItemGroup>

‎tests/Testing.Databases.SqlServer.Dac.Tests/SqlServerDatabaseInitializerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public async Task Test1Async()
8080
{
8181
this.initializer.IsInitialized.Should().BeTrue();
8282

83-
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
83+
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()", TestContext.Current.CancellationToken);
8484
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
8585

8686
// Check the constructor has been called
87-
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");
87+
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable", TestContext.Current.CancellationToken);
8888

8989
table.Rows.Should().HaveCount(2);
9090

@@ -103,11 +103,11 @@ public async Task Test2Async()
103103
{
104104
this.initializer.IsInitialized.Should().BeTrue();
105105

106-
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
106+
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()", TestContext.Current.CancellationToken);
107107
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
108108

109109
// Check the constructor has been called
110-
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");
110+
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable", TestContext.Current.CancellationToken);
111111

112112
table.Rows.Should().HaveCount(2);
113113

‎tests/Testing.Databases.SqlServer.Dac.Tests/Testing.Databases.SqlServer.Dac.Tests.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
56
</PropertyGroup>
67

78
<ItemGroup>
89
<Content Include="..\Testing.Databases.SqlServer.Tests.DacPac\bin\$(Configuration)\netstandard2.1\PosInformatique.Testing.Databases.SqlServer.Tests.DacPac.dacpac" Link="PosInformatique.Testing.Databases.SqlServer.Tests.DacPac.dacpac">
910
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1011
</Content>
1112
</ItemGroup>
12-
13-
<ItemGroup>
14-
<PackageReference Include="coverlet.collector">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="FluentAssertions" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
20-
<PackageReference Include="xunit" />
21-
<PackageReference Include="xunit.runner.visualstudio">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
</ItemGroup>
2613

2714
<ItemGroup>
2815
<ProjectReference Include="..\..\src\Testing.Databases.SqlServer.Dac\Testing.Databases.SqlServer.Dac.csproj" />

‎tests/Testing.Databases.SqlServer.EntityFramework.Tests/EntityFrameworkSqlServerExtensionsTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task Create_WithNoExistingDatabase()
2828

2929
database.ConnectionString.Should().Be(ConnectionStrings.Get("EntityFrameworkSqlServerExtensionsTest"));
3030

31-
var tables = await database.GetTablesAsync();
31+
var tables = await database.GetTablesAsync(TestContext.Current.CancellationToken);
3232

3333
tables.Should().HaveCount(1);
3434

@@ -56,7 +56,7 @@ public async Task Create_WithAlreadyExistingDatabase()
5656

5757
database.ConnectionString.Should().Be(ConnectionStrings.Get("EntityFrameworkSqlServerExtensionsTest"));
5858

59-
var tables = await database.GetTablesAsync();
59+
var tables = await database.GetTablesAsync(TestContext.Current.CancellationToken);
6060

6161
tables.Should().HaveCount(1);
6262

@@ -76,13 +76,13 @@ public async Task CreateAsync_WithNoExistingDatabase()
7676
using var dbContext = new DbContextTest(optionsBuilder.Options);
7777

7878
var server = new SqlServer(ConnectionString);
79-
await server.DeleteDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest));
79+
await server.DeleteDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest), TestContext.Current.CancellationToken);
8080

8181
var database = await server.CreateDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest), dbContext);
8282

8383
database.ConnectionString.Should().Be(ConnectionStrings.Get("EntityFrameworkSqlServerExtensionsTest"));
8484

85-
var tables = await database.GetTablesAsync();
85+
var tables = await database.GetTablesAsync(TestContext.Current.CancellationToken);
8686

8787
tables.Should().HaveCount(1);
8888

@@ -102,15 +102,15 @@ public async Task CreateAsync_WithAlreadyExistingDatabase()
102102
using var dbContext = new DbContextTest(optionsBuilder.Options);
103103

104104
var server = new SqlServer(ConnectionString);
105-
var emptyDatabase = await server.CreateEmptyDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest));
105+
var emptyDatabase = await server.CreateEmptyDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest), default, TestContext.Current.CancellationToken);
106106

107-
await emptyDatabase.ExecuteNonQueryAsync("CREATE TABLE [MustBeDeleted] ([Id] INT)");
107+
await emptyDatabase.ExecuteNonQueryAsync("CREATE TABLE [MustBeDeleted] ([Id] INT)", TestContext.Current.CancellationToken);
108108

109109
var database = await server.CreateDatabaseAsync(nameof(EntityFrameworkSqlServerExtensionsTest), dbContext);
110110

111111
database.ConnectionString.Should().Be(ConnectionStrings.Get("EntityFrameworkSqlServerExtensionsTest"));
112112

113-
var tables = await database.GetTablesAsync();
113+
var tables = await database.GetTablesAsync(TestContext.Current.CancellationToken);
114114

115115
tables.Should().HaveCount(1);
116116

‎tests/Testing.Databases.SqlServer.EntityFramework.Tests/Testing.Databases.SqlServer.EntityFramework.Tests.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
56
</PropertyGroup>
67

7-
<ItemGroup>
8-
<PackageReference Include="coverlet.collector">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
<PackageReference Include="FluentAssertions" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14-
<PackageReference Include="xunit" />
15-
<PackageReference Include="xunit.runner.visualstudio">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
19-
</ItemGroup>
20-
218
<ItemGroup>
229
<ProjectReference Include="..\..\src\Testing.Databases.SqlServer.EntityFramework\Testing.Databases.SqlServer.EntityFramework.csproj" />
2310
</ItemGroup>

‎tests/Testing.Databases.SqlServer.SqlCmd.Tests/SqlCmdDatabaseInitializerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ public async Task Test1Async()
8989
{
9090
this.initializer.IsInitialized.Should().BeTrue();
9191

92-
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
92+
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()", TestContext.Current.CancellationToken);
9393
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
9494

9595
// Check the constructor has been called
96-
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");
96+
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable", TestContext.Current.CancellationToken);
9797

9898
table.Rows.Should().HaveCount(2);
9999

@@ -112,11 +112,11 @@ public async Task Test2Async()
112112
{
113113
this.initializer.IsInitialized.Should().BeTrue();
114114

115-
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
115+
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()", TestContext.Current.CancellationToken);
116116
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
117117

118118
// Check the constructor has been called
119-
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");
119+
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable", TestContext.Current.CancellationToken);
120120

121121
table.Rows.Should().HaveCount(2);
122122

‎tests/Testing.Databases.SqlServer.SqlCmd.Tests/Testing.Databases.SqlServer.SqlCmd.Tests.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
56
</PropertyGroup>
67

78
<ItemGroup>
@@ -10,20 +11,6 @@
1011
</Content>
1112
</ItemGroup>
1213

13-
<ItemGroup>
14-
<PackageReference Include="coverlet.collector">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="FluentAssertions" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
20-
<PackageReference Include="xunit" />
21-
<PackageReference Include="xunit.runner.visualstudio">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
</ItemGroup>
26-
2714
<ItemGroup>
2815
<ProjectReference Include="..\..\src\Testing.Databases.SqlServer.SqlCmd\Testing.Databases.SqlServer.SqlCmd.csproj" />
2916
</ItemGroup>

‎tests/Testing.Databases.SqlServer.Tests.DacPac/Testing.Databases.SqlServer.Tests.DacPac.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<CreateNewDatabase>True</CreateNewDatabase>
1111
</PropertyGroup>
1212

13+
<ItemGroup>
14+
<PackageReference Remove="coverlet.collector" />
15+
<PackageReference Remove="FluentAssertions" />
16+
<PackageReference Remove="xunit.v3" />
17+
</ItemGroup>
18+
1319
<ItemGroup>
1420
<Content Remove="bin\**" />
1521
<None Remove="bin\**" />

‎tests/Testing.Databases.SqlServer.Tests.Source/Testing.Databases.SqlServer.Tests.Source.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<CreateNewDatabase>True</CreateNewDatabase>
1111
</PropertyGroup>
1212

13+
<ItemGroup>
14+
<PackageReference Remove="coverlet.collector" />
15+
<PackageReference Remove="FluentAssertions" />
16+
<PackageReference Remove="xunit.v3" />
17+
</ItemGroup>
18+
1319
<ItemGroup>
1420
<Content Remove="bin\**" />
1521
<None Remove="bin\**" />

0 commit comments

Comments
 (0)