autofix tests based on feedback from xunit analyzers (#1997)

Octokit.Tests.Integration/Clients/AssigneesClientTests.cs

@@ -50,7 +50,7 @@ public async Task CanListAssignees()
     {
         // Repository owner is always an assignee
         var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.True(assignees.Any(u => u.Login == Helper.UserName));
+        Assert.Contains(assignees, u => u.Login == Helper.UserName);
     }
 
     [IntegrationTest]
@@ -69,19 +69,20 @@ public async Task CanAddAndRemoveAssignees()
         Assert.IsType<Issue>(addAssignees);
 
         //Check if assignee was added to issue
-        Assert.True(addAssignees.Assignees.Any(x => x.Login == _context.RepositoryOwner));
+        Assert.Contains(addAssignees.Assignees, x => x.Login == _context.RepositoryOwner);
 
         //Test to remove assignees
         var removeAssignees = await _github.Issue.Assignee.RemoveAssignees(_context.RepositoryOwner, _context.RepositoryName, issue.Number, newAssignees);
 
         //Check if assignee was removed
-        Assert.False(removeAssignees.Assignees.Any(x => x.Login == _context.RepositoryOwner));
+        Assert.DoesNotContain(removeAssignees.Assignees, x => x.Login == _context.RepositoryOwner);
     }
 
+    [IntegrationTest]
     public async Task CanListAssigneesWithRepositoryId()
     {
         // Repository owner is always an assignee
         var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.Repository.Id);
-        Assert.True(assignees.Any(u => u.Login == Helper.UserName));
+        Assert.Contains(assignees, u => u.Login == Helper.UserName);
     }
 }

Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs

@@ -69,7 +69,7 @@ public async Task CannotCreatePersonalTokenWhenUsingOauthTokenCredentials()
                 new[] { "user" });
 
             var error = await Assert.ThrowsAsync<ForbiddenException>(() => github.Authorization.Create(newAuthorization));
-            Assert.True(error.Message.Contains("username and password Basic Auth"));
+            Assert.Contains("username and password Basic Auth", error.Message);
         }
 
         [BasicAuthenticationTest(Skip = "See https://github.com/octokit/octokit.net/issues/1000 for issue to investigate this further")]

Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs

@@ -131,7 +131,7 @@ public async Task UpdatesPreferences()
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
 
@@ -148,7 +148,7 @@ public async Task UpdatesPreferencesWithRepositoryId()
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
         }

Octokit.Tests.Integration/Clients/CommitsClientTests.cs

@@ -52,13 +52,13 @@ public async Task CanDeserializeVerificationObjectInResponse()
         var commit = await github.Git.Commit.Get("noonari", "Signature-Verification", "1965d149ce1151cf411300d15f8d890d9259bd21");
 
         Assert.False(commit.Verification.Verified);
-        Assert.Equal(commit.Verification.Signature,
- "-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1\n\niQEcBAABAgAGBQJXYT2BAAoJEJyZ1vxIV0+N9ZwIAKlf3dk9n1q1mD5AT3Ahtj9o\nF4H25zsHynJk2lnH4YxVvDBEc/uMCXzX6orihZiSdA5UXE7tPyEEZddQdp8pxulX\ncIsFKcrfQqHJnTbT90z5PhAk94lyN9fFngzPW1tgZZVjp2YiiqgXduBWWm6EREOh\nS1Iu9wBqScQomhTXoksmNZyGTZ0LviSi0pkqRY64pQhKnpLlu1OFXaeDvhYocB+E\nY5URZsXodvIkBuzCkWCu8ra4eaXIIARkas4+jIvn0FIx9CzEVz0Zau/5Fk+BR+Te\n7a3/7JH7yuObPB0hqPSuFYyxtvPfxtayvhkGD3YkQqDAkWCpISGyVFzxrrC7z0Y=\n=kbih\n-----END PGP SIGNATURE-----");
+        Assert.Equal("-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1\n\niQEcBAABAgAGBQJXYT2BAAoJEJyZ1vxIV0+N9ZwIAKlf3dk9n1q1mD5AT3Ahtj9o\nF4H25zsHynJk2lnH4YxVvDBEc/uMCXzX6orihZiSdA5UXE7tPyEEZddQdp8pxulX\ncIsFKcrfQqHJnTbT90z5PhAk94lyN9fFngzPW1tgZZVjp2YiiqgXduBWWm6EREOh\nS1Iu9wBqScQomhTXoksmNZyGTZ0LviSi0pkqRY64pQhKnpLlu1OFXaeDvhYocB+E\nY5URZsXodvIkBuzCkWCu8ra4eaXIIARkas4+jIvn0FIx9CzEVz0Zau/5Fk+BR+Te\n7a3/7JH7yuObPB0hqPSuFYyxtvPfxtayvhkGD3YkQqDAkWCpISGyVFzxrrC7z0Y=\n=kbih\n-----END PGP SIGNATURE-----",
+            commit.Verification.Signature);
 
-        Assert.Equal(commit.Verification.Payload,
-            "tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <[email protected]> 1465990529 +0500\ncommitter noonari <[email protected]> 1465990529 +0500\n\ngpg stuff\n");
+        Assert.Equal("tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <[email protected]> 1465990529 +0500\ncommitter noonari <[email protected]> 1465990529 +0500\n\ngpg stuff\n",
+            commit.Verification.Payload);
 
-        Assert.Equal(commit.Verification.Reason, VerificationReason.UnknownKey);
+        Assert.Equal(VerificationReason.UnknownKey, commit.Verification.Reason);
     }
 
     [IntegrationTest]

Octokit.Tests.Integration/Clients/FollowersClientTests.cs

@@ -24,7 +24,7 @@ public async Task ReturnsUsersTheCurrentUserIsFollowing()
         var following = await _github.User.Followers.GetAllFollowingForCurrent();
 
         Assert.NotNull(following);
-        Assert.True(following.Any(f => f.Login == "alfhenrik"));
+        Assert.Contains(following, f => f.Login == "alfhenrik");
     }
 
     [IntegrationTest]
@@ -44,7 +44,7 @@ public async Task ReturnsUsersFollowingTheUser()
         var followers = await _github.User.Followers.GetAll("alfhenrik");
 
         Assert.NotEmpty(followers);
-        Assert.True(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.Contains(followers, f => f.Login == _currentUser.Login);
     }
 
     [IntegrationTest]
@@ -73,26 +73,26 @@ public async Task FollowUserNotBeingFollowedByTheUser()
 
         Assert.True(result);
         Assert.NotEmpty(following);
-        Assert.True(following.Any(f => f.Login == "alfhenrik"));
+        Assert.Contains(following, f => f.Login == "alfhenrik");
     }
 
     [IntegrationTest]
     public async Task UnfollowUserBeingFollowedByTheUser()
     {
         await _github.User.Followers.Follow("alfhenrik");
         var followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.True(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.Contains(followers, f => f.Login == _currentUser.Login);
 
         await _github.User.Followers.Unfollow("alfhenrik");
         followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.False(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.DoesNotContain(followers, f => f.Login == _currentUser.Login);
     }
 
     [IntegrationTest]
     public async Task UnfollowUserNotBeingFollowedTheUser()
     {
         var followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.False(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.DoesNotContain(followers, f => f.Login == _currentUser.Login);
 
         await _github.User.Followers.Unfollow("alfhenrik");
     }

Octokit.Tests.Integration/Clients/GistsClientTests.cs

@@ -109,11 +109,11 @@ public async Task CanListGists()
         var starredGists = await _fixture.GetAllStarred();
 
         Assert.NotNull(starredGists);
-        Assert.True(starredGists.Any(x => x.Id == createdGist.Id));
+        Assert.Contains(starredGists, x => x.Id == createdGist.Id);
 
         var starredGistsSinceStartTime = await _fixture.GetAllStarred(startTime);
         Assert.NotNull(starredGistsSinceStartTime);
-        Assert.True(starredGistsSinceStartTime.Any(x => x.Id == createdGist.Id));
+        Assert.Contains(starredGistsSinceStartTime, x => x.Id == createdGist.Id);
 
         await _fixture.Delete(createdGist.Id);
     }

Octokit.Tests.Integration/Clients/GitHubClientTests.cs

@@ -32,7 +32,7 @@ public async Task CanRetrieveLastApiInfoWithEtag()
                 Assert.False(string.IsNullOrEmpty(result.Etag));
                 Assert.True(result.RateLimit.Limit > 0);
                 Assert.True(result.RateLimit.Remaining > -1);
-                Assert.NotNull(result.RateLimit.Reset);
+                Assert.NotEqual(default, result.RateLimit.Reset);
             }
         }
 
@@ -53,7 +53,7 @@ public async Task CanRetrieveLastApiInfoWithLinks()
             Assert.False(string.IsNullOrEmpty(result.Etag));
             Assert.True(result.RateLimit.Limit > 0);
             Assert.True(result.RateLimit.Remaining > -1);
-            Assert.NotNull(result.RateLimit.Reset);
+            Assert.NotEqual(default, result.RateLimit.Reset);
         }
 
         [PersonalAccessTokenTest]
@@ -73,7 +73,7 @@ public async Task CanRetrieveLastApiInfoAcceptedOauth()
             Assert.False(string.IsNullOrEmpty(result.Etag));
             Assert.True(result.RateLimit.Limit > 0);
             Assert.True(result.RateLimit.Remaining > -1);
-            Assert.NotNull(result.RateLimit.Reset);
+            Assert.NotEqual(default, result.RateLimit.Reset);
         }
     }
 }

Octokit.Tests.Integration/Clients/IssuesClientTests.cs

@@ -200,9 +200,9 @@ public async Task CanCreateRetrieveAndCloseIssue()
             Assert.True(retrieved.Assignees.Count == 1);
             Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner);
             var all = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
-            Assert.True(all.Any(i => i.Number == retrieved.Number));
-            Assert.True(all.Any(i => i.Assignees.Count == 1));
-            Assert.True(all.Any(i => i.Assignees[0].Login == _context.RepositoryOwner));
+            Assert.Contains(all, i => i.Number == retrieved.Number);
+            Assert.Contains(all, i => i.Assignees.Count == 1);
+            Assert.Contains(all, i => i.Assignees[0].Login == _context.RepositoryOwner);
         }
         finally
         {
@@ -225,7 +225,7 @@ public async Task CanCreateRetrieveAndCloseIssueWithRepositoryId()
             var retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number);
             var all = await _issuesClient.GetAllForRepository(_context.Repository.Id);
             Assert.NotNull(retrieved);
-            Assert.True(all.Any(i => i.Number == retrieved.Number));
+            Assert.Contains(all, i => i.Number == retrieved.Number);
         }
         finally
         {
@@ -462,10 +462,10 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithoutStart()
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -492,10 +492,10 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithoutStartWithRepositoryId
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -523,7 +523,7 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithStart()
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
 
         Assert.Equal(1, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -551,7 +551,7 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithStartWithRepositoryId()
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
 
         Assert.Equal(1, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -572,10 +572,10 @@ public async Task CanRetrieveAllIssues()
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -597,7 +597,7 @@ public async Task CanRetrieveIssuesWithMultipleAssignees()
         var request = new RepositoryIssueRequest { State = ItemStateFilter.All };
         var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request);
 
-        Assert.True(issues.Any(x => x.Assignees.Count > 0));
+        Assert.Contains(issues, x => x.Assignees.Count > 0);
     }
 
     [IntegrationTest]
@@ -657,10 +657,10 @@ public async Task CanRetrieveAllIssuesWithRepositoryId()
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]

Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs

@@ -85,21 +85,21 @@ public async Task CanRetrieveResourceRateLimits()
             Assert.True(result.Resources.Core.Remaining > -1);
             Assert.True(result.Resources.Core.Remaining <= result.Resources.Core.Limit);
             Assert.True(result.Resources.Core.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Core.Reset);
+            Assert.NotEqual(default, result.Resources.Core.Reset);
 
             // Test the search limits
             Assert.True(result.Resources.Search.Limit > 0);
             Assert.True(result.Resources.Search.Remaining > -1);
             Assert.True(result.Resources.Search.Remaining <= result.Resources.Search.Limit);
             Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Search.Reset);
+            Assert.NotEqual(default, result.Resources.Search.Reset);
 
             // Test the depreciated rate limits
             Assert.True(result.Rate.Limit > 0);
             Assert.True(result.Rate.Remaining > -1);
             Assert.True(result.Rate.Remaining <= result.Rate.Limit);
             Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Search.Reset);
+            Assert.NotEqual(default, result.Resources.Search.Reset);
         }
     }
 

Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs

@@ -261,10 +261,7 @@ public async Task CannotRemoveMemberOfOrganizationAsOutsideCollaborator()
                 var ex = await Assert.ThrowsAsync<UserIsOrganizationMemberException>(()
                     => _gitHub.Organization.OutsideCollaborator.Delete(Helper.Organization, Helper.UserName));
 
-                Assert.True(string.Equals(
-                    "You cannot specify an organization member to remove as an outside collaborator.",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal("You cannot specify an organization member to remove as an outside collaborator.", ex.Message, ignoreCase: true);
             }
         }
 
@@ -296,10 +293,7 @@ public async Task CannotConvertNonOrgMemberToOutsideCollaborator()
                 var ex = await Assert.ThrowsAsync<UserIsNotMemberOfOrganizationException>(()
                     => _gitHub.Organization.OutsideCollaborator.ConvertFromMember(Helper.Organization, _fixtureCollaborator));
 
-                Assert.True(string.Equals(
-                    $"{_fixtureCollaborator} is not a member of the {Helper.Organization} organization.",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal($"{_fixtureCollaborator} is not a member of the {Helper.Organization} organization.", ex.Message, ignoreCase: true);
             }
 
             [OrganizationTest]
@@ -308,10 +302,7 @@ public async Task CannotConvertLastOrgOwnerToOutsideCollaborator()
                 var ex = await Assert.ThrowsAsync<UserIsLastOwnerOfOrganizationException>(()
                     => _gitHub.Organization.OutsideCollaborator.ConvertFromMember(Helper.Organization, Helper.UserName));
 
-                Assert.True(string.Equals(
-                    "Cannot convert the last owner to an outside collaborator",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal("Cannot convert the last owner to an outside collaborator", ex.Message, ignoreCase: true);
             }
         }
     }

Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs

@@ -398,7 +398,7 @@ public async Task CanDeleteReview()
 
                 var retrievedReviews = await _client.GetAll(context.RepositoryOwner, context.RepositoryName, pullRequest.Number);
 
-                Assert.False(retrievedReviews.Any(x => x.Id == createdReview.Id));
+                Assert.DoesNotContain(retrievedReviews, x => x.Id == createdReview.Id);
             }
         }
 
@@ -415,7 +415,7 @@ public async Task CanDeleteReviewWithRepositoryId()
 
                 var retrievedReviews = await _client.GetAll(context.RepositoryId, pullRequest.Number);
 
-                Assert.False(retrievedReviews.Any(x => x.Id == createdReview.Id));
+                Assert.DoesNotContain(retrievedReviews, x => x.Id == createdReview.Id);
             }
         }
     }