Skip to content

Commit 3892c0c

Browse files
sadukiesadukie
committed
Address all the warnings for xUnit.v3 updates with cancellation tokens
1 parent 067172b commit 3892c0c

File tree

4 files changed

+62
-67
lines changed

4 files changed

+62
-67
lines changed

‎tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ public AccountControllerSignIn(TestApplication factory)
2121
[Fact]
2222
public async Task ReturnsSignInScreenOnGet()
2323
{
24-
var response = await Client.GetAsync("/identity/account/login");
24+
var response = await Client.GetAsync("/identity/account/login", TestContext.Current.CancellationToken);
2525
response.EnsureSuccessStatusCode();
26-
var stringResponse = await response.Content.ReadAsStringAsync();
26+
var stringResponse = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
2727

2828
Assert.Contains("[email protected]", stringResponse);
2929
}
@@ -45,9 +45,9 @@ public void RegexMatchesValidRequestVerificationToken()
4545
[Fact]
4646
public async Task ReturnsFormWithRequestVerificationToken()
4747
{
48-
var response = await Client.GetAsync("/identity/account/login");
48+
var response = await Client.GetAsync("/identity/account/login", TestContext.Current.CancellationToken);
4949
response.EnsureSuccessStatusCode();
50-
var stringResponse = await response.Content.ReadAsStringAsync();
50+
var stringResponse = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
5151

5252
string token = WebPageHelpers.GetRequestVerificationToken(stringResponse);
5353
Assert.True(token.Length > 50);
@@ -56,19 +56,19 @@ public async Task ReturnsFormWithRequestVerificationToken()
5656
[Fact]
5757
public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials()
5858
{
59-
var getResponse = await Client.GetAsync("/identity/account/login");
59+
var getResponse = await Client.GetAsync("/identity/account/login", TestContext.Current.CancellationToken);
6060
getResponse.EnsureSuccessStatusCode();
61-
var stringResponse1 = await getResponse.Content.ReadAsStringAsync();
61+
var stringResponse1 = await getResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
6262

6363
var keyValues = new List<KeyValuePair<string, string>>
6464
{
65-
new KeyValuePair<string, string>("Email", "[email protected]"),
66-
new KeyValuePair<string, string>("Password", "Pass@word1"),
67-
new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse1))
65+
new("Email", "[email protected]"),
66+
new("Password", "Pass@word1"),
67+
new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse1))
6868
};
6969
var formContent = new FormUrlEncodedContent(keyValues);
7070

71-
var postResponse = await Client.PostAsync("/identity/account/login", formContent);
71+
var postResponse = await Client.PostAsync("/identity/account/login", formContent, TestContext.Current.CancellationToken);
7272
Assert.Equal(HttpStatusCode.Redirect, postResponse.StatusCode);
7373
Assert.Equal(new System.Uri("/", UriKind.Relative), postResponse.Headers.Location);
7474
}
@@ -77,36 +77,36 @@ public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials()
7777
public async Task UpdatePhoneNumberProfile()
7878
{
7979
//Login
80-
var getResponse = await Client.GetAsync("/identity/account/login");
80+
var getResponse = await Client.GetAsync("/identity/account/login", TestContext.Current.CancellationToken);
8181
getResponse.EnsureSuccessStatusCode();
82-
var stringResponse1 = await getResponse.Content.ReadAsStringAsync();
82+
var stringResponse1 = await getResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
8383
var keyValues = new List<KeyValuePair<string, string>>
8484
{
85-
new KeyValuePair<string, string>("Email", "[email protected]"),
86-
new KeyValuePair<string, string>("Password", "Pass@word1"),
87-
new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse1))
85+
new("Email", "[email protected]"),
86+
new("Password", "Pass@word1"),
87+
new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse1))
8888
};
8989
var formContent = new FormUrlEncodedContent(keyValues);
90-
await Client.PostAsync("/identity/account/login", formContent);
90+
await Client.PostAsync("/identity/account/login", formContent, TestContext.Current.CancellationToken);
9191

9292
//Profile page
93-
var profileResponse = await Client.GetAsync("/manage/my-account");
93+
var profileResponse = await Client.GetAsync("/manage/my-account", TestContext.Current.CancellationToken);
9494
profileResponse.EnsureSuccessStatusCode();
95-
var stringProfileResponse = await profileResponse.Content.ReadAsStringAsync();
95+
var stringProfileResponse = await profileResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
9696

9797
//Update phone number
9898
var updateProfileValues = new List<KeyValuePair<string, string>>
9999
{
100-
new KeyValuePair<string, string>("Email", "[email protected]"),
101-
new KeyValuePair<string, string>("PhoneNumber", "03656565"),
102-
new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringProfileResponse))
100+
new("Email", "[email protected]"),
101+
new("PhoneNumber", "03656565"),
102+
new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringProfileResponse))
103103
};
104104
var updateProfileContent = new FormUrlEncodedContent(updateProfileValues);
105-
var postProfileResponse = await Client.PostAsync("/manage/my-account", updateProfileContent);
105+
var postProfileResponse = await Client.PostAsync("/manage/my-account", updateProfileContent, TestContext.Current.CancellationToken);
106106

107107
Assert.Equal(HttpStatusCode.Redirect, postProfileResponse.StatusCode);
108-
var profileResponse2 = await Client.GetAsync("/manage/my-account");
109-
var stringProfileResponse2 = await profileResponse2.Content.ReadAsStringAsync();
108+
var profileResponse2 = await Client.GetAsync("/manage/my-account", TestContext.Current.CancellationToken);
109+
var stringProfileResponse2 = await profileResponse2.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
110110
Assert.Contains("03656565", stringProfileResponse2);
111111

112112
}

‎tests/FunctionalTests/Web/Pages/Basket/BasketPageCheckout.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ public async Task RedirectsToLoginIfNotAuthenticated()
2121
{
2222

2323
// Load Home Page
24-
var response = await Client.GetAsync("/");
24+
var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
2525
response.EnsureSuccessStatusCode();
26-
var stringResponse1 = await response.Content.ReadAsStringAsync();
26+
var stringResponse1 = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
2727

2828
string token = WebPageHelpers.GetRequestVerificationToken(stringResponse1);
2929

3030
// Add Item to Cart
3131
var keyValues = new List<KeyValuePair<string, string>>
3232
{
33-
new KeyValuePair<string, string>("id", "2"),
34-
new KeyValuePair<string, string>("name", "shirt"),
35-
new KeyValuePair<string, string>("price", "19.49"),
36-
new KeyValuePair<string, string>("__RequestVerificationToken", token)
33+
new("id", "2"),
34+
new("name", "shirt"),
35+
new("price", "19.49"),
36+
new("__RequestVerificationToken", token)
3737
};
3838
var formContent = new FormUrlEncodedContent(keyValues);
39-
var postResponse = await Client.PostAsync("/basket/index", formContent);
39+
var postResponse = await Client.PostAsync("/basket/index", formContent, TestContext.Current.CancellationToken);
4040
postResponse.EnsureSuccessStatusCode();
41-
var stringResponse = await postResponse.Content.ReadAsStringAsync();
41+
var stringResponse = await postResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
4242
Assert.Contains(".NET Black &amp; White Mug", stringResponse);
4343

4444
keyValues.Clear();
4545

4646
formContent = new FormUrlEncodedContent(keyValues);
47-
var postResponse2 = await Client.PostAsync("/Basket/Checkout", formContent);
47+
var postResponse2 = await Client.PostAsync("/Basket/Checkout", formContent, TestContext.Current.CancellationToken);
4848
Assert.Contains("/Identity/Account/Login", postResponse2!.RequestMessage!.RequestUri!.ToString()!);
4949
}
5050
}

‎tests/FunctionalTests/Web/Pages/Basket/IndexTest.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@ public IndexTest(TestApplication factory)
2121
public async Task OnPostUpdateTo50Successfully()
2222
{
2323
// Load Home Page
24-
var response = await Client.GetAsync("/");
24+
var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
2525
response.EnsureSuccessStatusCode();
26-
var stringResponse1 = await response.Content.ReadAsStringAsync();
26+
var stringResponse1 = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
2727

2828
string token = WebPageHelpers.GetRequestVerificationToken(stringResponse1);
2929

3030
// Add Item to Cart
3131
var keyValues = new List<KeyValuePair<string, string>>
3232
{
33-
new KeyValuePair<string, string>("id", "2"),
34-
new KeyValuePair<string, string>("name", "shirt"),
35-
new KeyValuePair<string, string>("__RequestVerificationToken", token)
33+
new("id", "2"),
34+
new("name", "shirt"),
35+
new("__RequestVerificationToken", token)
3636
};
3737
var formContent = new FormUrlEncodedContent(keyValues);
38-
var postResponse = await Client.PostAsync("/basket/index", formContent);
38+
var postResponse = await Client.PostAsync("/basket/index", formContent, TestContext.Current.CancellationToken);
3939
postResponse.EnsureSuccessStatusCode();
40-
var stringResponse = await postResponse.Content.ReadAsStringAsync();
40+
var stringResponse = await postResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
4141
Assert.Contains(".NET Black &amp; White Mug", stringResponse);
4242

4343
//Update
4444
var updateKeyValues = new List<KeyValuePair<string, string>>
4545
{
46-
new KeyValuePair<string, string>("Items[0].Id", WebPageHelpers.GetId(stringResponse)),
47-
new KeyValuePair<string, string>("Items[0].Quantity", "49"),
48-
new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
46+
new("Items[0].Id", WebPageHelpers.GetId(stringResponse)),
47+
new("Items[0].Quantity", "49"),
48+
new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
4949
};
5050
var updateContent = new FormUrlEncodedContent(updateKeyValues);
51-
var updateResponse = await Client.PostAsync("/basket/update", updateContent);
51+
var updateResponse = await Client.PostAsync("/basket/update", updateContent, TestContext.Current.CancellationToken);
5252

53-
var stringUpdateResponse = await updateResponse.Content.ReadAsStringAsync();
53+
var stringUpdateResponse = await updateResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
5454

5555
Assert.Contains("/basket/update", updateResponse!.RequestMessage!.RequestUri!.ToString()!);
5656
decimal expectedTotalAmount = 416.50M;
@@ -61,36 +61,36 @@ public async Task OnPostUpdateTo50Successfully()
6161
public async Task OnPostUpdateTo0EmptyBasket()
6262
{
6363
// Load Home Page
64-
var response = await Client.GetAsync("/");
64+
var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
6565
response.EnsureSuccessStatusCode();
66-
var stringResponse1 = await response.Content.ReadAsStringAsync();
66+
var stringResponse1 = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
6767

6868
string token = WebPageHelpers.GetRequestVerificationToken(stringResponse1);
6969

7070
// Add Item to Cart
7171
var keyValues = new List<KeyValuePair<string, string>>
7272
{
73-
new KeyValuePair<string, string>("id", "2"),
74-
new KeyValuePair<string, string>("name", "shirt"),
75-
new KeyValuePair<string, string>("__RequestVerificationToken", token)
73+
new("id", "2"),
74+
new("name", "shirt"),
75+
new("__RequestVerificationToken", token)
7676
};
7777
var formContent = new FormUrlEncodedContent(keyValues);
78-
var postResponse = await Client.PostAsync("/basket/index", formContent);
78+
var postResponse = await Client.PostAsync("/basket/index", formContent, TestContext.Current.CancellationToken);
7979
postResponse.EnsureSuccessStatusCode();
80-
var stringResponse = await postResponse.Content.ReadAsStringAsync();
80+
var stringResponse = await postResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
8181
Assert.Contains(".NET Black &amp; White Mug", stringResponse);
8282

8383
//Update
8484
var updateKeyValues = new List<KeyValuePair<string, string>>
8585
{
86-
new KeyValuePair<string, string>("Items[0].Id", WebPageHelpers.GetId(stringResponse)),
87-
new KeyValuePair<string, string>("Items[0].Quantity", "0"),
88-
new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
86+
new("Items[0].Id", WebPageHelpers.GetId(stringResponse)),
87+
new("Items[0].Quantity", "0"),
88+
new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
8989
};
9090
var updateContent = new FormUrlEncodedContent(updateKeyValues);
91-
var updateResponse = await Client.PostAsync("/basket/update", updateContent);
91+
var updateResponse = await Client.PostAsync("/basket/update", updateContent, TestContext.Current.CancellationToken);
9292

93-
var stringUpdateResponse = await updateResponse.Content.ReadAsStringAsync();
93+
var stringUpdateResponse = await updateResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
9494

9595
Assert.Contains("/basket/update", updateResponse!.RequestMessage!.RequestUri!.ToString()!);
9696
Assert.Contains("Basket is empty", stringUpdateResponse);

‎tests/FunctionalTests/Web/Pages/HomePageOnGet.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
using Microsoft.eShopWeb.FunctionalTests.Web;
22
using Xunit;
33

4-
namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages;
4+
namespace Microsoft.eShopWeb.FunctionalTests.Web.Pages;
55

66
[Collection("Sequential")]
7-
public class HomePageOnGet : IClassFixture<TestApplication>
7+
public class HomePageOnGet(TestApplication factory) : IClassFixture<TestApplication>
88
{
9-
public HomePageOnGet(TestApplication factory)
10-
{
11-
Client = factory.CreateClient();
12-
}
13-
14-
public HttpClient Client { get; }
9+
public HttpClient Client { get; } = factory.CreateClient();
1510

1611
[Fact]
1712
public async Task ReturnsHomePageWithProductListing()
1813
{
1914
// Arrange & Act
20-
var response = await Client.GetAsync("/");
15+
var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
2116
response.EnsureSuccessStatusCode();
22-
var stringResponse = await response.Content.ReadAsStringAsync();
17+
var stringResponse = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
2318

2419
// Assert
2520
Assert.Contains(".NET Bot Black Sweatshirt", stringResponse);

0 commit comments

Comments
 (0)