From f166dfebe5887c8e968ed0352636890bcea5733b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 22 Aug 2017 17:36:41 -0700 Subject: [PATCH] Upgrade to xunit 2.3.0-beta4 Includes changes required to fix issues discovered by new analyzers added in this upgrade. --- build/dependencies.props | 4 ++-- .../Implementation/FacebookLoginScenarios.cs | 12 ++++++------ .../Implementation/GoogleLoginScenarios.cs | 16 ++++++++-------- .../MicrosoftAccountAuthenticationScenarios.cs | 12 ++++++------ .../OpenIdConnectLoginScenarios.cs | 16 ++++++++-------- .../Implementation/TwitterLoginScenarios.cs | 4 ++-- .../Implementation/Validator.cs | 8 ++++---- .../ShoppingCartControllerTest.cs | 8 ++++---- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b9d4245e15..c67761e4ef 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -7,7 +7,7 @@ 2.0.0-* 2.0.0-* 2.0.0-* - 15.3.0-* - 2.3.0-beta2-* + 15.3.0 + 2.3.0-beta4-build3742 diff --git a/test/MusicStore.E2ETests/Implementation/FacebookLoginScenarios.cs b/test/MusicStore.E2ETests/Implementation/FacebookLoginScenarios.cs index e831525bc6..1f8274c912 100644 --- a/test/MusicStore.E2ETests/Implementation/FacebookLoginScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/FacebookLoginScenarios.cs @@ -34,12 +34,12 @@ namespace E2ETests response = await DoPostAsync("Account/ExternalLogin", content); Assert.StartsWith("https://www.facebook.com/v2.6/dialog/oauth", response.Headers.Location.ToString()); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); - Assert.Equal("code", queryItems["response_type"]); - Assert.Equal("[AppId]", queryItems["client_id"]); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-facebook", queryItems["redirect_uri"]); - Assert.Equal("public_profile,email,read_friendlists,user_checkins", queryItems["scope"]); - Assert.Equal("ValidStateData", queryItems["state"]); - Assert.Equal("custom", queryItems["custom_redirect_uri"]); + Assert.Equal("code", queryItems["response_type"]); + Assert.Equal("[AppId]", queryItems["client_id"]); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-facebook", queryItems["redirect_uri"]); + Assert.Equal("public_profile,email,read_friendlists,user_checkins", queryItems["scope"]); + Assert.Equal("ValidStateData", queryItems["state"]); + Assert.Equal("custom", queryItems["custom_redirect_uri"]); //Check for the correlation cookie // Workaround for https://github.com/dotnet/corefx/issues/21250 Assert.True(response.Headers.TryGetValues("Set-Cookie", out var setCookieValues)); diff --git a/test/MusicStore.E2ETests/Implementation/GoogleLoginScenarios.cs b/test/MusicStore.E2ETests/Implementation/GoogleLoginScenarios.cs index bd0cd68d6e..35a1eeac11 100644 --- a/test/MusicStore.E2ETests/Implementation/GoogleLoginScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/GoogleLoginScenarios.cs @@ -32,15 +32,15 @@ namespace E2ETests var content = new FormUrlEncodedContent(formParameters.ToArray()); response = await DoPostAsync("Account/ExternalLogin", content); - Assert.Equal("https://accounts.google.com/o/oauth2/auth", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); + Assert.Equal("https://accounts.google.com/o/oauth2/auth", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); - Assert.Equal("code", queryItems["response_type"]); - Assert.Equal("offline", queryItems["access_type"]); - Assert.Equal("[ClientId]", queryItems["client_id"]); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-google", queryItems["redirect_uri"]); - Assert.Equal("openid profile email", queryItems["scope"]); - Assert.Equal("ValidStateData", queryItems["state"]); - Assert.Equal("custom", queryItems["custom_redirect_uri"]); + Assert.Equal("code", queryItems["response_type"]); + Assert.Equal("offline", queryItems["access_type"]); + Assert.Equal("[ClientId]", queryItems["client_id"]); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-google", queryItems["redirect_uri"]); + Assert.Equal("openid profile email", queryItems["scope"]); + Assert.Equal("ValidStateData", queryItems["state"]); + Assert.Equal("custom", queryItems["custom_redirect_uri"]); //Check for the correlation cookie // Workaround for https://github.com/dotnet/corefx/issues/21250 Assert.True(response.Headers.TryGetValues("Set-Cookie", out var setCookieValues)); diff --git a/test/MusicStore.E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs b/test/MusicStore.E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs index 534e54436d..bfca72d5d2 100644 --- a/test/MusicStore.E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs @@ -34,12 +34,12 @@ namespace E2ETests response = await DoPostAsync("Account/ExternalLogin", content); Assert.StartsWith("https://login.microsoftonline.com/common/oauth2/v2.0/authorize", response.Headers.Location.ToString()); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); - Assert.Equal("code", queryItems["response_type"]); - Assert.Equal("[ClientId]", queryItems["client_id"]); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-microsoft", queryItems["redirect_uri"]); - Assert.Equal("https://graph.microsoft.com/user.read wl.basic wl.signin", queryItems["scope"]); - Assert.Equal("ValidStateData", queryItems["state"]); - Assert.Equal("custom", queryItems["custom_redirect_uri"]); + Assert.Equal("code", queryItems["response_type"]); + Assert.Equal("[ClientId]", queryItems["client_id"]); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "signin-microsoft", queryItems["redirect_uri"]); + Assert.Equal("https://graph.microsoft.com/user.read wl.basic wl.signin", queryItems["scope"]); + Assert.Equal("ValidStateData", queryItems["state"]); + Assert.Equal("custom", queryItems["custom_redirect_uri"]); //Check for the correlation cookie // Workaround for https://github.com/dotnet/corefx/issues/21250 diff --git a/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs b/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs index 18722bffa7..6f75115626 100644 --- a/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/OpenIdConnectLoginScenarios.cs @@ -32,13 +32,13 @@ namespace E2ETests var content = new FormUrlEncodedContent(formParameters.ToArray()); response = await DoPostAsync("Account/ExternalLogin", content); - Assert.Equal("https://login.windows.net/4afbc689-805b-48cf-a24c-d4aa3248a248/oauth2/authorize", response.Headers.Location?.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); + Assert.Equal("https://login.windows.net/4afbc689-805b-48cf-a24c-d4aa3248a248/oauth2/authorize", response.Headers.Location?.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location?.Query)); - Assert.Equal("c99497aa-3ee2-4707-b8a8-c33f51323fef", queryItems["client_id"]); - Assert.Equal("form_post", queryItems["response_mode"]); - Assert.Equal("code id_token", queryItems["response_type"]); - Assert.Equal("openid profile", queryItems["scope"]); - Assert.Equal("ValidStateData", queryItems["state"]); + Assert.Equal("c99497aa-3ee2-4707-b8a8-c33f51323fef", queryItems["client_id"]); + Assert.Equal("form_post", queryItems["response_mode"]); + Assert.Equal("code id_token", queryItems["response_type"]); + Assert.Equal("openid profile", queryItems["scope"]); + Assert.Equal("ValidStateData", queryItems["state"]); // Workaround for https://github.com/dotnet/corefx/issues/21250 Assert.True(response.Headers.TryGetValues("Set-Cookie", out var setCookieValues)); @@ -123,11 +123,11 @@ namespace E2ETests } Assert.DoesNotContain(IdentityCookieName, GetCookieNames()); - Assert.Equal( + Assert.Equal( "https://login.windows.net/4afbc689-805b-48cf-a24c-d4aa3248a248/oauth2/logout", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "signout-callback-oidc", queryItems["post_logout_redirect_uri"]); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "signout-callback-oidc", queryItems["post_logout_redirect_uri"]); response = await DoGetAsync(queryItems["post_logout_redirect_uri"] + "?state=" + queryItems["state"]); Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); diff --git a/test/MusicStore.E2ETests/Implementation/TwitterLoginScenarios.cs b/test/MusicStore.E2ETests/Implementation/TwitterLoginScenarios.cs index 7c70b4787e..2b9b7849ab 100644 --- a/test/MusicStore.E2ETests/Implementation/TwitterLoginScenarios.cs +++ b/test/MusicStore.E2ETests/Implementation/TwitterLoginScenarios.cs @@ -35,8 +35,8 @@ namespace E2ETests response = await DoPostAsync("Account/ExternalLogin", content); Assert.StartsWith("https://api.twitter.com/oauth/authenticate", response.Headers.Location.ToString()); var queryItems = new QueryCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); - Assert.Equal("custom", queryItems["custom_redirect_uri"]); - Assert.Equal("valid_oauth_token", queryItems["oauth_token"]); + Assert.Equal("custom", queryItems["custom_redirect_uri"]); + Assert.Equal("valid_oauth_token", queryItems["oauth_token"]); //Check for the correlation cookie Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri))["__TwitterState"]); diff --git a/test/MusicStore.E2ETests/Implementation/Validator.cs b/test/MusicStore.E2ETests/Implementation/Validator.cs index 87c83a15fa..e254c2d026 100644 --- a/test/MusicStore.E2ETests/Implementation/Validator.cs +++ b/test/MusicStore.E2ETests/Implementation/Validator.cs @@ -165,7 +165,7 @@ namespace E2ETests var response = await DoGetAsync("Admin/StoreManager/"); await ThrowIfResponseStatusNotOk(response); var responseContent = await response.Content.ReadAsStringAsync(); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "Admin/StoreManager/", response.RequestMessage.RequestUri.AbsoluteUri); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "Admin/StoreManager/", response.RequestMessage.RequestUri.AbsoluteUri); _logger.LogInformation("Successfully acccessed the store inventory"); } @@ -189,7 +189,7 @@ namespace E2ETests { Assert.Contains("Log in – ASP.NET MVC Music Store", responseContent, StringComparison.OrdinalIgnoreCase); Assert.Contains("

Use a local account to log in.

", responseContent, StringComparison.OrdinalIgnoreCase); - Assert.Equal(_deploymentResult.ApplicationBaseUri + PrefixBaseAddress("Account/Login?ReturnUrl=%2F{0}%2FAdmin%2FStoreManager%2F"), response.RequestMessage.RequestUri.AbsoluteUri); + Assert.Equal(_deploymentResult.ApplicationBaseUri + PrefixBaseAddress("Account/Login?ReturnUrl=%2F{0}%2FAdmin%2FStoreManager%2F"), response.RequestMessage.RequestUri.AbsoluteUri); _logger.LogInformation("Redirected to login page as expected."); } else @@ -250,7 +250,7 @@ namespace E2ETests responseContent = await response.Content.ReadAsStringAsync(); //Account verification - Assert.Equal(_deploymentResult.ApplicationBaseUri + "Account/Register", response.RequestMessage.RequestUri.AbsoluteUri); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "Account/Register", response.RequestMessage.RequestUri.AbsoluteUri); Assert.Contains("For DEMO only: You can click this link to confirm the email:", responseContent, StringComparison.OrdinalIgnoreCase); var startIndex = responseContent.IndexOf("[[link]]", startIndex); @@ -397,7 +397,7 @@ namespace E2ETests var content = new FormUrlEncodedContent(formParameters.ToArray()); response = await DoPostAsync("Admin/StoreManager/create", content); responseContent = await response.Content.ReadAsStringAsync(); - Assert.Equal(_deploymentResult.ApplicationBaseUri + "Admin/StoreManager", response.RequestMessage.RequestUri.AbsoluteUri); + Assert.Equal(_deploymentResult.ApplicationBaseUri + "Admin/StoreManager", response.RequestMessage.RequestUri.AbsoluteUri); Assert.Contains(albumName, responseContent); _logger.LogInformation("Successfully created an album with name '{album}' in the store", albumName); return albumName; diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index 6a4329215a..c5a2a926c7 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -57,7 +57,7 @@ namespace MusicStore.Controllers Assert.Null(viewResult.ViewName); var model = Assert.IsType(viewResult.ViewData.Model); - Assert.Equal(0, model.CartItems.Count); + Assert.Empty(model.CartItems); Assert.Equal(0, model.CartTotal); } @@ -83,7 +83,7 @@ namespace MusicStore.Controllers Assert.Null(viewResult.ViewName); var model = Assert.IsType(viewResult.ViewData.Model); - Assert.Equal(0, model.CartItems.Count); + Assert.Empty(model.CartItems); Assert.Equal(0, model.CartTotal); } @@ -148,7 +148,7 @@ namespace MusicStore.Controllers // Assert var cart = ShoppingCart.GetCart(dbContext, httpContext); - Assert.Equal(1, (await cart.GetCartItems()).Count); + Assert.Single(await cart.GetCartItems()); Assert.Equal(albumId, (await cart.GetCartItems()).Single().AlbumId); var redirectResult = Assert.IsType(result); @@ -209,7 +209,7 @@ namespace MusicStore.Controllers Assert.Equal(" has been removed from your shopping cart.", viewModel.Message); var cart = ShoppingCart.GetCart(dbContext, httpContext); - Assert.False((await cart.GetCartItems()).Any(c => c.CartItemId == cartItemId)); + Assert.DoesNotContain((await cart.GetCartItems()), c => c.CartItemId == cartItemId); } private static CartItem[] CreateTestCartItems(string cartId, decimal itemPrice, int numberOfItem)