zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-06 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brendan Forster
2019-09-16 19:46:40 -03:00
committed by GitHub
parent 61bd1d1018
commit 45bc5eced7
50 changed files with 222 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Octokit.Tests.Integration/Clients/AssigneesClientTests.cs
View File

@@ -50,7 +50,7 @@ public class AssigneesClientTests
{ {
// Repository owner is always an assignee // Repository owner is always an assignee
var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); 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] [IntegrationTest]
@@ -69,19 +69,20 @@ public class AssigneesClientTests
Assert.IsType<Issue>(addAssignees); Assert.IsType<Issue>(addAssignees);
//Check if assignee was added to issue //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 //Test to remove assignees
var removeAssignees = await _github.Issue.Assignee.RemoveAssignees(_context.RepositoryOwner, _context.RepositoryName, issue.Number, newAssignees); var removeAssignees = await _github.Issue.Assignee.RemoveAssignees(_context.RepositoryOwner, _context.RepositoryName, issue.Number, newAssignees);
//Check if assignee was removed //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() public async Task CanListAssigneesWithRepositoryId()
{ {
// Repository owner is always an assignee // Repository owner is always an assignee
var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.Repository.Id); 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);
} }
} }

2
Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs
View File

@@ -69,7 +69,7 @@ namespace Octokit.Tests.Integration.Clients
new[] { "user" }); new[] { "user" });
var error = await Assert.ThrowsAsync<ForbiddenException>(() => github.Authorization.Create(newAuthorization)); 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")] [BasicAuthenticationTest(Skip = "See https://github.com/octokit/octokit.net/issues/1000 for issue to investigate this further")]

4
Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs
View File

@@ -131,7 +131,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.Equal(repoContext.RepositoryId, result.Repository.Id); Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId); 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 @@ namespace Octokit.Tests.Integration.Clients
Assert.Equal(repoContext.RepositoryId, result.Repository.Id); Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId); Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting); Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
} }
} }
} }

10
Octokit.Tests.Integration/Clients/CommitsClientTests.cs
View File

@@ -52,13 +52,13 @@ public class CommitsClientTests
var commit = await github.Git.Commit.Get("noonari", "Signature-Verification", "1965d149ce1151cf411300d15f8d890d9259bd21"); var commit = await github.Git.Commit.Get("noonari", "Signature-Verification", "1965d149ce1151cf411300d15f8d890d9259bd21");
Assert.False(commit.Verification.Verified); Assert.False(commit.Verification.Verified);
Assert.Equal(commit.Verification.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-----",
"-----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, Assert.Equal("tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <SarmadSattar1@gmail.com> 1465990529 +0500\ncommitter noonari <SarmadSattar1@gmail.com> 1465990529 +0500\n\ngpg stuff\n",
"tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <SarmadSattar1@gmail.com> 1465990529 +0500\ncommitter noonari <SarmadSattar1@gmail.com> 1465990529 +0500\n\ngpg stuff\n"); commit.Verification.Payload);
Assert.Equal(commit.Verification.Reason, VerificationReason.UnknownKey); Assert.Equal(VerificationReason.UnknownKey, commit.Verification.Reason);
} }
[IntegrationTest] [IntegrationTest]

12
Octokit.Tests.Integration/Clients/FollowersClientTests.cs
View File

@@ -24,7 +24,7 @@ public class FollowersClientTests : IDisposable
var following = await _github.User.Followers.GetAllFollowingForCurrent(); var following = await _github.User.Followers.GetAllFollowingForCurrent();
Assert.NotNull(following); Assert.NotNull(following);
Assert.True(following.Any(f => f.Login == "alfhenrik")); Assert.Contains(following, f => f.Login == "alfhenrik");
} }
[IntegrationTest] [IntegrationTest]
@@ -44,7 +44,7 @@ public class FollowersClientTests : IDisposable
var followers = await _github.User.Followers.GetAll("alfhenrik"); var followers = await _github.User.Followers.GetAll("alfhenrik");
Assert.NotEmpty(followers); Assert.NotEmpty(followers);
Assert.True(followers.Any(f => f.Login == _currentUser.Login)); Assert.Contains(followers, f => f.Login == _currentUser.Login);
} }
[IntegrationTest] [IntegrationTest]
@@ -73,7 +73,7 @@ public class FollowersClientTests : IDisposable
Assert.True(result); Assert.True(result);
Assert.NotEmpty(following); Assert.NotEmpty(following);
Assert.True(following.Any(f => f.Login == "alfhenrik")); Assert.Contains(following, f => f.Login == "alfhenrik");
} }
[IntegrationTest] [IntegrationTest]
@@ -81,18 +81,18 @@ public class FollowersClientTests : IDisposable
{ {
await _github.User.Followers.Follow("alfhenrik"); await _github.User.Followers.Follow("alfhenrik");
var followers = await _github.User.Followers.GetAll("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"); await _github.User.Followers.Unfollow("alfhenrik");
followers = await _github.User.Followers.GetAll("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] [IntegrationTest]
public async Task UnfollowUserNotBeingFollowedTheUser() public async Task UnfollowUserNotBeingFollowedTheUser()
{ {
var followers = await _github.User.Followers.GetAll("alfhenrik"); 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"); await _github.User.Followers.Unfollow("alfhenrik");
} }

4
Octokit.Tests.Integration/Clients/GistsClientTests.cs
View File

@@ -109,11 +109,11 @@ public class GistsClientTests
var starredGists = await _fixture.GetAllStarred(); var starredGists = await _fixture.GetAllStarred();
Assert.NotNull(starredGists); 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); var starredGistsSinceStartTime = await _fixture.GetAllStarred(startTime);
Assert.NotNull(starredGistsSinceStartTime); 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); await _fixture.Delete(createdGist.Id);
} }

6
Octokit.Tests.Integration/Clients/GitHubClientTests.cs
View File

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

46
Octokit.Tests.Integration/Clients/IssuesClientTests.cs
View File

@@ -200,9 +200,9 @@ public class IssuesClientTests : IDisposable
Assert.True(retrieved.Assignees.Count == 1); Assert.True(retrieved.Assignees.Count == 1);
Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner); Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner);
var all = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); var all = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
Assert.True(all.Any(i => i.Number == retrieved.Number)); Assert.Contains(all, i => i.Number == retrieved.Number);
Assert.True(all.Any(i => i.Assignees.Count == 1)); Assert.Contains(all, i => i.Assignees.Count == 1);
Assert.True(all.Any(i => i.Assignees[0].Login == _context.RepositoryOwner)); Assert.Contains(all, i => i.Assignees[0].Login == _context.RepositoryOwner);
} }
finally finally
{ {
@@ -225,7 +225,7 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number); var retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number);
var all = await _issuesClient.GetAllForRepository(_context.Repository.Id); var all = await _issuesClient.GetAllForRepository(_context.Repository.Id);
Assert.NotNull(retrieved); Assert.NotNull(retrieved);
Assert.True(all.Any(i => i.Number == retrieved.Number)); Assert.Contains(all, i => i.Number == retrieved.Number);
} }
finally finally
{ {
@@ -462,10 +462,10 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
Assert.Equal(4, retrieved.Count); Assert.Equal(4, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue1.Number)); Assert.Contains(retrieved, i => i.Number == issue1.Number);
Assert.True(retrieved.Any(i => i.Number == issue2.Number)); Assert.Contains(retrieved, i => i.Number == issue2.Number);
Assert.True(retrieved.Any(i => i.Number == issue3.Number)); Assert.Contains(retrieved, i => i.Number == issue3.Number);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]
@@ -492,10 +492,10 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options); var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
Assert.Equal(4, retrieved.Count); Assert.Equal(4, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue1.Number)); Assert.Contains(retrieved, i => i.Number == issue1.Number);
Assert.True(retrieved.Any(i => i.Number == issue2.Number)); Assert.Contains(retrieved, i => i.Number == issue2.Number);
Assert.True(retrieved.Any(i => i.Number == issue3.Number)); Assert.Contains(retrieved, i => i.Number == issue3.Number);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]
@@ -523,7 +523,7 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
Assert.Equal(1, retrieved.Count); Assert.Equal(1, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]
@@ -551,7 +551,7 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options); var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
Assert.Equal(1, retrieved.Count); Assert.Equal(1, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]
@@ -572,10 +572,10 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request);
Assert.Equal(4, retrieved.Count); Assert.Equal(4, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue1.Number)); Assert.Contains(retrieved, i => i.Number == issue1.Number);
Assert.True(retrieved.Any(i => i.Number == issue2.Number)); Assert.Contains(retrieved, i => i.Number == issue2.Number);
Assert.True(retrieved.Any(i => i.Number == issue3.Number)); Assert.Contains(retrieved, i => i.Number == issue3.Number);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]
@@ -597,7 +597,7 @@ public class IssuesClientTests : IDisposable
var request = new RepositoryIssueRequest { State = ItemStateFilter.All }; var request = new RepositoryIssueRequest { State = ItemStateFilter.All };
var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request); 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] [IntegrationTest]
@@ -657,10 +657,10 @@ public class IssuesClientTests : IDisposable
var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request); var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request);
Assert.Equal(4, retrieved.Count); Assert.Equal(4, retrieved.Count);
Assert.True(retrieved.Any(i => i.Number == issue1.Number)); Assert.Contains(retrieved, i => i.Number == issue1.Number);
Assert.True(retrieved.Any(i => i.Number == issue2.Number)); Assert.Contains(retrieved, i => i.Number == issue2.Number);
Assert.True(retrieved.Any(i => i.Number == issue3.Number)); Assert.Contains(retrieved, i => i.Number == issue3.Number);
Assert.True(retrieved.Any(i => i.Number == issue4.Number)); Assert.Contains(retrieved, i => i.Number == issue4.Number);
} }
[IntegrationTest] [IntegrationTest]

6
Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs
View File

@@ -85,21 +85,21 @@ public class MiscellaneousClientTests
Assert.True(result.Resources.Core.Remaining > -1); Assert.True(result.Resources.Core.Remaining > -1);
Assert.True(result.Resources.Core.Remaining <= result.Resources.Core.Limit); Assert.True(result.Resources.Core.Remaining <= result.Resources.Core.Limit);
Assert.True(result.Resources.Core.ResetAsUtcEpochSeconds > 0); Assert.True(result.Resources.Core.ResetAsUtcEpochSeconds > 0);
Assert.NotNull(result.Resources.Core.Reset); Assert.NotEqual(default, result.Resources.Core.Reset);
// Test the search limits // Test the search limits
Assert.True(result.Resources.Search.Limit > 0); Assert.True(result.Resources.Search.Limit > 0);
Assert.True(result.Resources.Search.Remaining > -1); Assert.True(result.Resources.Search.Remaining > -1);
Assert.True(result.Resources.Search.Remaining <= result.Resources.Search.Limit); Assert.True(result.Resources.Search.Remaining <= result.Resources.Search.Limit);
Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0); 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 // Test the depreciated rate limits
Assert.True(result.Rate.Limit > 0); Assert.True(result.Rate.Limit > 0);
Assert.True(result.Rate.Remaining > -1); Assert.True(result.Rate.Remaining > -1);
Assert.True(result.Rate.Remaining <= result.Rate.Limit); Assert.True(result.Rate.Remaining <= result.Rate.Limit);
Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0); Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0);
Assert.NotNull(result.Resources.Search.Reset); Assert.NotEqual(default, result.Resources.Search.Reset);
} }
} }

15
Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
View File

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

4
Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
View File

@@ -398,7 +398,7 @@ public class PullRequestReviewsClientTests
var retrievedReviews = await _client.GetAll(context.RepositoryOwner, context.RepositoryName, pullRequest.Number); 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 class PullRequestReviewsClientTests
var retrievedReviews = await _client.GetAll(context.RepositoryId, pullRequest.Number); 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);
} }
} }
} }

14
Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
View File

@@ -97,7 +97,7 @@ public class PullRequestsClientTests : IDisposable
Assert.Equal(result.Title, pullRequests[0].Title); Assert.Equal(result.Title, pullRequests[0].Title);
Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login); Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
Assert.Equal(1, pullRequests[0].Assignees.Count); Assert.Equal(1, pullRequests[0].Assignees.Count);
Assert.True(pullRequests[0].Assignees.Any(x => x.Login == Helper.UserName)); Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
} }
[IntegrationTest] [IntegrationTest]
@@ -120,7 +120,7 @@ public class PullRequestsClientTests : IDisposable
Assert.Equal(result.Title, pullRequests[0].Title); Assert.Equal(result.Title, pullRequests[0].Title);
Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login); Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
Assert.Equal(1, pullRequests[0].Assignees.Count); Assert.Equal(1, pullRequests[0].Assignees.Count);
Assert.True(pullRequests[0].Assignees.Any(x => x.Login == Helper.UserName)); Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
} }
[IntegrationTest] [IntegrationTest]
@@ -143,7 +143,7 @@ public class PullRequestsClientTests : IDisposable
Assert.Equal(result.Title, pullRequests[0].Title); Assert.Equal(result.Title, pullRequests[0].Title);
Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login); Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
Assert.Equal(1, pullRequests[0].Labels.Count); Assert.Equal(1, pullRequests[0].Labels.Count);
Assert.True(pullRequests[0].Labels.Any(x => x.Name == labelName)); Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
} }
[IntegrationTest] [IntegrationTest]
@@ -166,7 +166,7 @@ public class PullRequestsClientTests : IDisposable
Assert.Equal(result.Title, pullRequests[0].Title); Assert.Equal(result.Title, pullRequests[0].Title);
Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login); Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
Assert.Equal(1, pullRequests[0].Labels.Count); Assert.Equal(1, pullRequests[0].Labels.Count);
Assert.True(pullRequests[0].Labels.Any(x => x.Name == labelName)); Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
} }
[IntegrationTest] [IntegrationTest]
@@ -775,7 +775,7 @@ public class PullRequestsClientTests : IDisposable
var merge = new MergePullRequest { Sha = fakeSha }; var merge = new MergePullRequest { Sha = fakeSha };
var ex = await Assert.ThrowsAsync<PullRequestMismatchException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge)); var ex = await Assert.ThrowsAsync<PullRequestMismatchException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge));
Assert.True(ex.Message.StartsWith("Head branch was modified")); Assert.StartsWith("Head branch was modified", ex.Message);
} }
[IntegrationTest] [IntegrationTest]
@@ -796,12 +796,12 @@ public class PullRequestsClientTests : IDisposable
var updatedPullRequest = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number); var updatedPullRequest = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number);
Assert.False(updatedPullRequest.Mergeable); Assert.False(updatedPullRequest.Mergeable);
Assert.Equal(updatedPullRequest.MergeableState, MergeableState.Dirty); Assert.Equal(MergeableState.Dirty, updatedPullRequest.MergeableState);
var merge = new MergePullRequest { Sha = pullRequest.Head.Sha }; var merge = new MergePullRequest { Sha = pullRequest.Head.Sha };
var ex = await Assert.ThrowsAsync<PullRequestNotMergeableException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge)); var ex = await Assert.ThrowsAsync<PullRequestNotMergeableException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge));
Assert.True(ex.Message.Equals("Pull Request is not mergeable")); Assert.Equal("Pull Request is not mergeable", ex.Message);
} }
[IntegrationTest] [IntegrationTest]

8
Octokit.Tests.Integration/Clients/ReferencesClientTests.cs
View File

@@ -111,7 +111,7 @@ public class ReferencesClientTests : IDisposable
var firstRefsPage = await _fixture.GetAll("octokit", "octokit.net", startOptions); var firstRefsPage = await _fixture.GetAll("octokit", "octokit.net", startOptions);
var secondRefsPage = await _fixture.GetAll("octokit", "octokit.net", skipStartOptions); var secondRefsPage = await _fixture.GetAll("octokit", "octokit.net", skipStartOptions);
Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x))); Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
} }
[IntegrationTest(Skip = "This is paging for a long long time")] [IntegrationTest(Skip = "This is paging for a long long time")]
@@ -169,7 +169,7 @@ public class ReferencesClientTests : IDisposable
var firstRefsPage = await _fixture.GetAll(7528679, startOptions); var firstRefsPage = await _fixture.GetAll(7528679, startOptions);
var secondRefsPage = await _fixture.GetAll(7528679, skipStartOptions); var secondRefsPage = await _fixture.GetAll(7528679, skipStartOptions);
Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x))); Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
} }
[IntegrationTest] [IntegrationTest]
@@ -227,7 +227,7 @@ public class ReferencesClientTests : IDisposable
var firstRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", startOptions); var firstRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", startOptions);
var secondRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", skipStartOptions); var secondRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", skipStartOptions);
Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x))); Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
} }
[IntegrationTest] [IntegrationTest]
@@ -285,7 +285,7 @@ public class ReferencesClientTests : IDisposable
var firstRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", startOptions); var firstRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", startOptions);
var secondRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", skipStartOptions); var secondRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", skipStartOptions);
Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x))); Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
} }
[IntegrationTest] [IntegrationTest]

16
Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
View File

@@ -124,7 +124,7 @@ public class ReleasesClientTests
var releases = await _releaseClient.GetAll("git-tfs", "git-tfs"); var releases = await _releaseClient.GetAll("git-tfs", "git-tfs");
Assert.True(releases.Count > 5); Assert.True(releases.Count > 5);
Assert.True(releases.Any(release => release.TagName == "v0.18.0")); Assert.Contains(releases, release => release.TagName == "v0.18.0");
} }
[IntegrationTest] [IntegrationTest]
@@ -133,7 +133,7 @@ public class ReleasesClientTests
var releases = await _releaseClient.GetAll(252774); var releases = await _releaseClient.GetAll(252774);
Assert.True(releases.Count > 5); Assert.True(releases.Count > 5);
Assert.True(releases.Any(release => release.TagName == "v0.18.0")); Assert.Contains(releases, release => release.TagName == "v0.18.0");
} }
[IntegrationTest] [IntegrationTest]
@@ -184,9 +184,9 @@ public class ReleasesClientTests
{ {
var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0"); var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0");
Assert.Equal(releaseByTag.Id, 8396883); Assert.Equal(8396883, releaseByTag.Id);
Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!"); Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
Assert.Equal(releaseByTag.TagName, "v0.28.0"); Assert.Equal("v0.28.0", releaseByTag.TagName);
} }
[IntegrationTest] [IntegrationTest]
@@ -194,9 +194,9 @@ public class ReleasesClientTests
{ {
var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0"); var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0");
Assert.Equal(releaseByTag.Id, 8396883); Assert.Equal(8396883, releaseByTag.Id);
Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!"); Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
Assert.Equal(releaseByTag.TagName, "v0.28.0"); Assert.Equal("v0.28.0", releaseByTag.TagName);
} }
[IntegrationTest] [IntegrationTest]

32
Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
View File

@@ -460,7 +460,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(Helper.UserName, repoName, update); _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
Assert.Equal(true, _repository.Private); Assert.True(_repository.Private);
} }
[PaidAccountTest] [PaidAccountTest]
@@ -480,7 +480,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(_repository.Id, update); _repository = await github.Repository.Edit(_repository.Id, update);
Assert.Equal(true, _repository.Private); Assert.True(_repository.Private);
} }
[IntegrationTest] [IntegrationTest]
@@ -493,7 +493,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(Helper.UserName, repoName, update); _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
Assert.Equal(false, _repository.HasDownloads); Assert.False(_repository.HasDownloads);
} }
[IntegrationTest] [IntegrationTest]
@@ -506,7 +506,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(_repository.Id, update); _repository = await github.Repository.Edit(_repository.Id, update);
Assert.Equal(false, _repository.HasDownloads); Assert.False(_repository.HasDownloads);
} }
[IntegrationTest] [IntegrationTest]
@@ -519,7 +519,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(Helper.UserName, repoName, update); _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
Assert.Equal(false, _repository.HasIssues); Assert.False(_repository.HasIssues);
} }
[IntegrationTest] [IntegrationTest]
@@ -532,7 +532,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(_repository.Id, update); _repository = await github.Repository.Edit(_repository.Id, update);
Assert.Equal(false, _repository.HasIssues); Assert.False(_repository.HasIssues);
} }
[IntegrationTest] [IntegrationTest]
@@ -545,7 +545,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(Helper.UserName, repoName, update); _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
Assert.Equal(false, _repository.HasWiki); Assert.False(_repository.HasWiki);
} }
[IntegrationTest] [IntegrationTest]
@@ -558,7 +558,7 @@ public class RepositoriesClientTests
_repository = await github.Repository.Edit(_repository.Id, update); _repository = await github.Repository.Edit(_repository.Id, update);
Assert.Equal(false, _repository.HasWiki); Assert.False(_repository.HasWiki);
} }
[IntegrationTest] [IntegrationTest]
@@ -933,7 +933,7 @@ public class RepositoriesClientTests
var contributors = await github.Repository.GetAllContributors("octokit", "octokit.net"); var contributors = await github.Repository.GetAllContributors("octokit", "octokit.net");
Assert.True(contributors.Any(c => c.Login == "pmacn")); Assert.Contains(contributors, c => c.Login == "pmacn");
} }
[IntegrationTest] [IntegrationTest]
@@ -943,7 +943,7 @@ public class RepositoriesClientTests
var contributors = await github.Repository.GetAllContributors(7528679); var contributors = await github.Repository.GetAllContributors(7528679);
Assert.True(contributors.Any(c => c.Login == "pmacn")); Assert.Contains(contributors, c => c.Login == "pmacn");
} }
[IntegrationTest] [IntegrationTest]
@@ -1085,7 +1085,7 @@ public class RepositoriesClientTests
var contributors = await github.Repository.GetAllContributors("ruby", "ruby", true); var contributors = await github.Repository.GetAllContributors("ruby", "ruby", true);
Assert.True(contributors.Any(c => c.Type == "Anonymous")); Assert.Contains(contributors, c => c.Type == "Anonymous");
} }
[IntegrationTest] [IntegrationTest]
@@ -1095,7 +1095,7 @@ public class RepositoriesClientTests
var contributors = await github.Repository.GetAllContributors(538746, true); var contributors = await github.Repository.GetAllContributors(538746, true);
Assert.True(contributors.Any(c => c.Type == "Anonymous")); Assert.Contains(contributors, c => c.Type == "Anonymous");
} }
[IntegrationTest] [IntegrationTest]
@@ -1330,7 +1330,7 @@ public class RepositoriesClientTests
var languages = await github.Repository.GetAllLanguages("octokit", "octokit.net"); var languages = await github.Repository.GetAllLanguages("octokit", "octokit.net");
Assert.NotEmpty(languages); Assert.NotEmpty(languages);
Assert.True(languages.Any(l => l.Name == "C#")); Assert.Contains(languages, l => l.Name == "C#");
} }
[IntegrationTest] [IntegrationTest]
@@ -1341,7 +1341,7 @@ public class RepositoriesClientTests
var languages = await github.Repository.GetAllLanguages(7528679); var languages = await github.Repository.GetAllLanguages(7528679);
Assert.NotEmpty(languages); Assert.NotEmpty(languages);
Assert.True(languages.Any(l => l.Name == "C#")); Assert.Contains(languages, l => l.Name == "C#");
} }
[IntegrationTest] [IntegrationTest]
@@ -1378,7 +1378,7 @@ public class RepositoriesClientTests
var tags = await github.Repository.GetAllTags("octokit", "octokit.net"); var tags = await github.Repository.GetAllTags("octokit", "octokit.net");
Assert.True(tags.Any(t => t.Name == "v0.1.0")); Assert.Contains(tags, t => t.Name == "v0.1.0");
} }
[IntegrationTest] [IntegrationTest]
@@ -1388,7 +1388,7 @@ public class RepositoriesClientTests
var tags = await github.Repository.GetAllTags(7528679); var tags = await github.Repository.GetAllTags(7528679);
Assert.True(tags.Any(t => t.Name == "v0.1.0")); Assert.Contains(tags, t => t.Name == "v0.1.0");
} }
[IntegrationTest] [IntegrationTest]

10
Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
View File

@@ -553,7 +553,7 @@ public class RepositoryBranchesClientTests
Assert.NotNull(requiredStatusChecks); Assert.NotNull(requiredStatusChecks);
Assert.NotNull(requiredStatusChecks.Contexts); Assert.NotNull(requiredStatusChecks.Contexts);
Assert.True(requiredStatusChecks.Contexts.Contains("new")); Assert.Contains("new", requiredStatusChecks.Contexts);
Assert.True(requiredStatusChecks.Strict); Assert.True(requiredStatusChecks.Strict);
Assert.Equal(1, requiredStatusChecks.Contexts.Count); Assert.Equal(1, requiredStatusChecks.Contexts.Count);
} }
@@ -567,7 +567,7 @@ public class RepositoryBranchesClientTests
Assert.NotNull(requiredStatusChecks); Assert.NotNull(requiredStatusChecks);
Assert.NotNull(requiredStatusChecks.Contexts); Assert.NotNull(requiredStatusChecks.Contexts);
Assert.True(requiredStatusChecks.Contexts.Contains("new")); Assert.Contains("new", requiredStatusChecks.Contexts);
Assert.True(requiredStatusChecks.Strict); Assert.True(requiredStatusChecks.Strict);
Assert.Equal(1, requiredStatusChecks.Contexts.Count); Assert.Equal(1, requiredStatusChecks.Contexts.Count);
} }
@@ -720,7 +720,6 @@ public class RepositoryBranchesClientTests
var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoOwner, repoName, "master", update); var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoOwner, repoName, "master", update);
Assert.NotNull(requiredStatusChecksContexts); Assert.NotNull(requiredStatusChecksContexts);
Assert.NotNull(requiredStatusChecksContexts.Count);
Assert.Equal(4, requiredStatusChecksContexts.Count); Assert.Equal(4, requiredStatusChecksContexts.Count);
} }
@@ -732,7 +731,6 @@ public class RepositoryBranchesClientTests
var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoId, "master", update); var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoId, "master", update);
Assert.NotNull(requiredStatusChecksContexts); Assert.NotNull(requiredStatusChecksContexts);
Assert.NotNull(requiredStatusChecksContexts.Count);
Assert.Equal(4, requiredStatusChecksContexts.Count); Assert.Equal(4, requiredStatusChecksContexts.Count);
} }
@@ -765,7 +763,7 @@ public class RepositoryBranchesClientTests
var deleted = await _client.DeleteRequiredStatusChecksContexts(repoOwner, repoName, "master", contextsToRemove); var deleted = await _client.DeleteRequiredStatusChecksContexts(repoOwner, repoName, "master", contextsToRemove);
Assert.NotNull(deleted); Assert.NotNull(deleted);
Assert.True(deleted.Contains("test")); Assert.Contains("test", deleted);
} }
} }
@@ -779,7 +777,7 @@ public class RepositoryBranchesClientTests
var deleted = await _client.DeleteRequiredStatusChecksContexts(repoId, "master", contextsToRemove); var deleted = await _client.DeleteRequiredStatusChecksContexts(repoId, "master", contextsToRemove);
Assert.NotNull(deleted); Assert.NotNull(deleted);
Assert.True(deleted.Contains("test")); Assert.Contains("test", deleted);
} }
} }
} }

4
Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
View File

@@ -59,7 +59,7 @@ public class RepositoryCommitsClientTests
{ {
var commit = await _fixture.Get(octokitNetRepositoryOwner, octokitNetRepositorName, "65a22f4d2cff94a286ac3e96440c810c5509196f"); var commit = await _fixture.Get(octokitNetRepositoryOwner, octokitNetRepositorName, "65a22f4d2cff94a286ac3e96440c810c5509196f");
Assert.True(commit.Files.Any(file => file.Filename.EndsWith("IConnection.cs"))); Assert.Contains(commit.Files, file => file.Filename.EndsWith("IConnection.cs"));
} }
[IntegrationTest] [IntegrationTest]
@@ -67,7 +67,7 @@ public class RepositoryCommitsClientTests
{ {
var commit = await _fixture.Get(octokitNetRepositoryId, "65a22f4d2cff94a286ac3e96440c810c5509196f"); var commit = await _fixture.Get(octokitNetRepositoryId, "65a22f4d2cff94a286ac3e96440c810c5509196f");
Assert.True(commit.Files.Any(file => file.Filename.EndsWith("IConnection.cs"))); Assert.Contains(commit.Files, file => file.Filename.EndsWith("IConnection.cs"));
} }
[IntegrationTest] [IntegrationTest]

8
Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
View File

@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration.Clients
var readme = await github.Repository.Content.GetReadme("octokit", "octokit.net"); var readme = await github.Repository.Content.GetReadme("octokit", "octokit.net");
Assert.Equal("README.md", readme.Name); Assert.Equal("README.md", readme.Name);
string readmeHtml = await readme.GetHtmlContent(); string readmeHtml = await readme.GetHtmlContent();
Assert.True(readmeHtml.StartsWith("<div id=")); Assert.StartsWith("<div id=", readmeHtml);
Assert.Contains("data-path=\"README.md\"", readmeHtml); Assert.Contains("data-path=\"README.md\"", readmeHtml);
Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml); Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
} }
@@ -31,7 +31,7 @@ namespace Octokit.Tests.Integration.Clients
var readme = await github.Repository.Content.GetReadme(7528679); var readme = await github.Repository.Content.GetReadme(7528679);
Assert.Equal("README.md", readme.Name); Assert.Equal("README.md", readme.Name);
string readmeHtml = await readme.GetHtmlContent(); string readmeHtml = await readme.GetHtmlContent();
Assert.True(readmeHtml.StartsWith("<div id=")); Assert.StartsWith("<div id=", readmeHtml);
Assert.Contains("data-path=\"README.md\"", readmeHtml); Assert.Contains("data-path=\"README.md\"", readmeHtml);
Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml); Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
} }
@@ -42,7 +42,7 @@ namespace Octokit.Tests.Integration.Clients
var github = Helper.GetAuthenticatedClient(); var github = Helper.GetAuthenticatedClient();
var readmeHtml = await github.Repository.Content.GetReadmeHtml("octokit", "octokit.net"); var readmeHtml = await github.Repository.Content.GetReadmeHtml("octokit", "octokit.net");
Assert.True(readmeHtml.StartsWith("<div id=")); Assert.StartsWith("<div id=", readmeHtml);
Assert.Contains("data-path=\"README.md\"", readmeHtml); Assert.Contains("data-path=\"README.md\"", readmeHtml);
Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml); Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
} }
@@ -53,7 +53,7 @@ namespace Octokit.Tests.Integration.Clients
var github = Helper.GetAuthenticatedClient(); var github = Helper.GetAuthenticatedClient();
var readmeHtml = await github.Repository.Content.GetReadmeHtml(7528679); var readmeHtml = await github.Repository.Content.GetReadmeHtml(7528679);
Assert.True(readmeHtml.StartsWith("<div id=")); Assert.StartsWith("<div id=", readmeHtml);
Assert.Contains("data-path=\"README.md\"", readmeHtml); Assert.Contains("data-path=\"README.md\"", readmeHtml);
Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml); Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
} }

8
Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
View File

@@ -417,7 +417,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotNull(forkCreated); Assert.NotNull(forkCreated);
Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName); Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName);
Assert.Equal(true, forkCreated.Fork); Assert.True(forkCreated.Fork);
} }
[IntegrationTest] [IntegrationTest]
@@ -434,7 +434,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotNull(forkCreated); Assert.NotNull(forkCreated);
Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName); Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName);
Assert.Equal(true, forkCreated.Fork); Assert.True(forkCreated.Fork);
} }
[OrganizationTest] [OrganizationTest]
@@ -451,7 +451,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotNull(forkCreated); Assert.NotNull(forkCreated);
Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName); Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName);
Assert.Equal(true, forkCreated.Fork); Assert.True(forkCreated.Fork);
} }
[OrganizationTest] [OrganizationTest]
@@ -468,7 +468,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotNull(forkCreated); Assert.NotNull(forkCreated);
Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName); Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName);
Assert.Equal(true, forkCreated.Fork); Assert.True(forkCreated.Fork);
} }
} }
} }

12
Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
View File

@@ -233,11 +233,11 @@ namespace Octokit.Tests.Integration.Clients
Assert.Equal(baseHookUrl, hook.Url); Assert.Equal(baseHookUrl, hook.Url);
Assert.Equal(baseHookUrl + "/test", hook.TestUrl); Assert.Equal(baseHookUrl + "/test", hook.TestUrl);
Assert.Equal(baseHookUrl + "/pings", hook.PingUrl); Assert.Equal(baseHookUrl + "/pings", hook.PingUrl);
Assert.NotNull(hook.CreatedAt); Assert.NotEqual(default, hook.CreatedAt);
Assert.NotNull(hook.UpdatedAt); Assert.NotEqual(default, hook.UpdatedAt);
Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x)); Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x));
Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x)); Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x));
Assert.Equal(false, hook.Active); Assert.False(hook.Active);
} }
[IntegrationTest] [IntegrationTest]
@@ -277,11 +277,11 @@ namespace Octokit.Tests.Integration.Clients
Assert.Equal(baseHookUrl, hook.Url); Assert.Equal(baseHookUrl, hook.Url);
Assert.Equal(baseHookUrl + "/test", hook.TestUrl); Assert.Equal(baseHookUrl + "/test", hook.TestUrl);
Assert.Equal(baseHookUrl + "/pings", hook.PingUrl); Assert.Equal(baseHookUrl + "/pings", hook.PingUrl);
Assert.NotNull(hook.CreatedAt); Assert.NotEqual(default, hook.CreatedAt);
Assert.NotNull(hook.UpdatedAt); Assert.NotEqual(default, hook.UpdatedAt);
Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x)); Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x));
Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x)); Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x));
Assert.Equal(false, hook.Active); Assert.False(hook.Active);
} }
Dictionary<string, string> CreateExpectedConfigDictionary(Dictionary<string, string> config, string url, WebHookContentType contentType, string secret) Dictionary<string, string> CreateExpectedConfigDictionary(Dictionary<string, string> config, string url, WebHookContentType contentType, string secret)

4
Octokit.Tests.Integration/Clients/SearchClientTests.cs
View File

@@ -32,7 +32,7 @@ public class SearchClientTests
}; };
var repos = await _gitHubClient.Search.SearchRepo(request); var repos = await _gitHubClient.Search.SearchRepo(request);
Assert.True(repos.Items.Any(x => x.Fork)); Assert.Contains(repos.Items, x => x.Fork);
} }
[IntegrationTest] [IntegrationTest]
@@ -112,7 +112,7 @@ public class SearchClientTests
foreach (var code in searchResults.Items) foreach (var code in searchResults.Items)
{ {
Assert.True(code.Name.EndsWith(".cs")); Assert.EndsWith(".cs", code.Name);
} }
} }

18
Octokit.Tests.Integration/Clients/TagsClientTests.cs
View File

@@ -36,8 +36,8 @@ namespace Octokit.Tests.Integration.Clients
var tag = await fixture.Create(context.Repository.Id, newTag); var tag = await fixture.Create(context.Repository.Id, newTag);
Assert.Equal(tag.Object.Type, TaggedType.Blob); Assert.Equal(TaggedType.Blob, tag.Object.Type);
Assert.Equal(tag.Message, "Hello"); Assert.Equal("Hello", tag.Message);
Assert.Equal(tag.Object.Sha, sha); Assert.Equal(tag.Object.Sha, sha);
} }
@@ -48,8 +48,8 @@ namespace Octokit.Tests.Integration.Clients
var tag = await fixture.Create(context.Repository.Id, newTag); var tag = await fixture.Create(context.Repository.Id, newTag);
Assert.Equal(tag.Object.Type, TaggedType.Blob); Assert.Equal(TaggedType.Blob, tag.Object.Type);
Assert.Equal(tag.Message, "Hello"); Assert.Equal("Hello", tag.Message);
Assert.Equal(tag.Object.Sha, sha); Assert.Equal(tag.Object.Sha, sha);
} }
} }
@@ -86,8 +86,8 @@ namespace Octokit.Tests.Integration.Clients
var gitTag = await fixture.Get(context.RepositoryOwner, context.RepositoryName, tag.Sha); var gitTag = await fixture.Get(context.RepositoryOwner, context.RepositoryName, tag.Sha);
Assert.NotNull(gitTag); Assert.NotNull(gitTag);
Assert.Equal(gitTag.Object.Type, TaggedType.Blob); Assert.Equal(TaggedType.Blob, gitTag.Object.Type);
Assert.Equal(gitTag.Message, "Hello"); Assert.Equal("Hello", gitTag.Message);
Assert.Equal(gitTag.Object.Sha, sha); Assert.Equal(gitTag.Object.Sha, sha);
} }
@@ -103,8 +103,8 @@ namespace Octokit.Tests.Integration.Clients
var gitTag = await github.Git.Tag.Get(context.Repository.Id, tag.Sha); var gitTag = await github.Git.Tag.Get(context.Repository.Id, tag.Sha);
Assert.NotNull(gitTag); Assert.NotNull(gitTag);
Assert.Equal(gitTag.Object.Type, TaggedType.Blob); Assert.Equal(TaggedType.Blob, gitTag.Object.Type);
Assert.Equal(gitTag.Message, "Hello"); Assert.Equal("Hello", gitTag.Message);
Assert.Equal(gitTag.Object.Sha, sha); Assert.Equal(gitTag.Object.Sha, sha);
} }
@@ -122,7 +122,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotNull(gitTag); Assert.NotNull(gitTag);
Assert.False(gitTag.Verification.Verified); Assert.False(gitTag.Verification.Verified);
Assert.Equal(gitTag.Verification.Reason, VerificationReason.Unsigned); Assert.Equal(VerificationReason.Unsigned, gitTag.Verification.Reason);
Assert.Null(gitTag.Verification.Signature); Assert.Null(gitTag.Verification.Signature);
Assert.Null(gitTag.Verification.Payload); Assert.Null(gitTag.Verification.Payload);
} }

4
Octokit.Tests.Integration/Clients/TeamsClientTests.cs
View File

@@ -72,8 +72,8 @@ public class TeamsClientTests
var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId); var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId);
Assert.Equal(2, teams.Count); Assert.Equal(2, teams.Count);
Assert.True(teams.Any(x => x.Id == team1.Id)); Assert.Contains(teams, x => x.Id == team1.Id);
Assert.True(teams.Any(x => x.Id == team2.Id)); Assert.Contains(teams, x => x.Id == team2.Id);
} }
} }

6
Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
View File

@@ -44,7 +44,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.NotEqual(default, first.Id);
Assert.NotNull(first.KeyId); Assert.NotNull(first.KeyId);
Assert.NotNull(first.PublicKey); Assert.NotNull(first.PublicKey);
Assert.Null(first.PrimaryKeyId); Assert.Null(first.PrimaryKeyId);
@@ -81,7 +81,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
// Verify key no longer exists // Verify key no longer exists
var keys = await github.User.GpgKey.GetAllForCurrent(); var keys = await github.User.GpgKey.GetAllForCurrent();
Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey)); Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
} }
[IntegrationTest] [IntegrationTest]
@@ -96,7 +96,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
await github.User.GpgKey.Delete(key.Id); await github.User.GpgKey.Delete(key.Id);
var keys = await github.User.GpgKey.GetAllForCurrent(); var keys = await github.User.GpgKey.GetAllForCurrent();
Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey)); Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
} }
} }
} }

6
Octokit.Tests.Integration/Clients/UserKeysClientTests.cs
View File

@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.NotEqual(default, first.Id);
Assert.NotNull(first.Key); Assert.NotNull(first.Key);
Assert.NotNull(first.Title); Assert.NotNull(first.Title);
Assert.NotNull(first.Url); Assert.NotNull(first.Url);
@@ -34,7 +34,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.NotEqual(default, first.Id);
Assert.NotNull(first.Key); Assert.NotNull(first.Key);
Assert.Null(first.Title); Assert.Null(first.Title);
Assert.Null(first.Url); Assert.Null(first.Url);
@@ -75,7 +75,7 @@ namespace Octokit.Tests.Integration.Clients
// Verify key no longer exists // Verify key no longer exists
var keys = await github.User.GitSshKey.GetAllForCurrent(); var keys = await github.User.GitSshKey.GetAllForCurrent();
Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData)); Assert.DoesNotContain(keys, k => k.Title == keyTitle && k.Key == keyData);
} }
} }
} }

2
Octokit.Tests.Integration/Helpers/ApplicationTestAttribute.cs
View File

@@ -25,7 +25,7 @@ namespace Octokit.Tests.Integration
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
} }
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/BasicAuthenticationTestAttribute.cs
View File

@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
} }
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/DualAccountTestAttribute.cs
View File

@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
} }
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/GitHubAppsTestAttribute.cs
View File

@@ -35,7 +35,7 @@ namespace Octokit.Tests.Integration
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
} }
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/GitHubEnterpriseTestAttribute.cs
View File

@@ -23,7 +23,7 @@ namespace Octokit.Tests.Integration
if (!EnterpriseHelper.IsGitHubEnterpriseEnabled) if (!EnterpriseHelper.IsGitHubEnterpriseEnabled)
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs
View File

@@ -19,7 +19,7 @@ namespace Octokit.Tests.Integration
{ {
return Helper.Credentials == null return Helper.Credentials == null
? Enumerable.Empty<IXunitTestCase>() ? Enumerable.Empty<IXunitTestCase>()
: new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; : new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/OrganizationTestAttribute.cs
View File

@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
} }
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs
View File

@@ -23,7 +23,7 @@ namespace Octokit.Tests.Integration
if (!Helper.IsPaidAccount) if (!Helper.IsPaidAccount)
return Enumerable.Empty<IXunitTestCase>(); return Enumerable.Empty<IXunitTestCase>();
return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }; return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
} }
} }

2
Octokit.Tests.Integration/Helpers/PersonalAccessTokenTestAttribute.cs
View File

@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration
public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute) public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
{ {
return Helper.IsUsingToken return Helper.IsUsingToken
? new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) } ? new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) }
: Enumerable.Empty<IXunitTestCase>(); : Enumerable.Empty<IXunitTestCase>();
} }
} }

4
Octokit.Tests.Integration/Reactive/ObservableCheckSuitesClientTests.cs
View File

@@ -133,7 +133,7 @@ namespace Octokit.Tests.Integration.Reactive
Assert.Equal(repoContext.RepositoryId, result.Repository.Id); Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId); Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting); Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
} }
} }
@@ -150,7 +150,7 @@ namespace Octokit.Tests.Integration.Reactive
Assert.Equal(repoContext.RepositoryId, result.Repository.Id); Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId); Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting); Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
} }
} }
} }

12
Octokit.Tests.Integration/Reactive/ObservableReleaseClientTests.cs
View File

@@ -101,9 +101,9 @@ namespace Octokit.Tests.Integration.Reactive
{ {
var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0"); var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0");
Assert.Equal(releaseByTag.Id, 8396883); Assert.Equal(8396883, releaseByTag.Id);
Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!"); Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
Assert.Equal(releaseByTag.TagName, "v0.28.0"); Assert.Equal("v0.28.0", releaseByTag.TagName);
} }
[IntegrationTest] [IntegrationTest]
@@ -111,9 +111,9 @@ namespace Octokit.Tests.Integration.Reactive
{ {
var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0"); var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0");
Assert.Equal(releaseByTag.Id, 8396883); Assert.Equal(8396883, releaseByTag.Id);
Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!"); Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
Assert.Equal(releaseByTag.TagName, "v0.28.0"); Assert.Equal("v0.28.0", releaseByTag.TagName);
} }
[IntegrationTest] [IntegrationTest]

4
Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
View File

@@ -30,8 +30,8 @@ public class ObservableTeamsClientTests
var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId).ToList(); var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId).ToList();
Assert.Equal(2, teams.Count); Assert.Equal(2, teams.Count);
Assert.True(teams.Any(x => x.Id == team1.Id)); Assert.Contains(teams, x => x.Id == team1.Id);
Assert.True(teams.Any(x => x.Id == team2.Id)); Assert.Contains(teams, x => x.Id == team2.Id);
} }
} }

4
Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
View File

@@ -33,7 +33,7 @@ namespace Octokit.Tests.Integration.Reactive
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.NotEqual(default, first.Id);
Assert.Null(first.PrimaryKeyId); Assert.Null(first.PrimaryKeyId);
Assert.NotNull(first.KeyId); Assert.NotNull(first.KeyId);
Assert.NotNull(first.PublicKey); Assert.NotNull(first.PublicKey);
@@ -89,7 +89,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
// Verify key no longer exists // Verify key no longer exists
var keys = await _gitHubClient.User.GpgKey.GetAllForCurrent().ToList(); var keys = await _gitHubClient.User.GpgKey.GetAllForCurrent().ToList();
Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey)); Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
} }
} }
} }

6
Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs
View File

@@ -27,7 +27,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.True(first.Id > 0);
Assert.NotNull(first.Key); Assert.NotNull(first.Key);
Assert.NotNull(first.Title); Assert.NotNull(first.Title);
Assert.NotNull(first.Url); Assert.NotNull(first.Url);
@@ -43,7 +43,7 @@ namespace Octokit.Tests.Integration.Clients
Assert.NotEmpty(keys); Assert.NotEmpty(keys);
var first = keys[0]; var first = keys[0];
Assert.NotNull(first.Id); Assert.True(first.Id > 0);
Assert.NotNull(first.Key); Assert.NotNull(first.Key);
Assert.Null(first.Title); Assert.Null(first.Title);
Assert.Null(first.Url); Assert.Null(first.Url);
@@ -81,7 +81,7 @@ namespace Octokit.Tests.Integration.Clients
// Verify key no longer exists // Verify key no longer exists
var keys = await _github.User.GitSshKey.GetAllForCurrent().ToList(); var keys = await _github.User.GitSshKey.GetAllForCurrent().ToList();
Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData)); Assert.DoesNotContain(keys, k => k.Title == keyTitle && k.Key == keyData);
} }
} }
} }

2
Octokit.Tests.Integration/RedirectTests.cs
View File

@@ -31,7 +31,7 @@ namespace Octokit.Tests.Integration
var issue = await client.Issue.Create(owner, oldRepoName, newIssue); var issue = await client.Issue.Create(owner, oldRepoName, newIssue);
Assert.NotNull(issue); Assert.NotNull(issue);
Assert.True(issue.Url.Contains("repository-after-rename")); Assert.Contains("repository-after-rename", issue.Url);
var resolvedIssue = await client.Issue.Get(owner, newRepoName, issue.Number); var resolvedIssue = await client.Issue.Get(owner, newRepoName, issue.Number);

2
Octokit.Tests/Clients/AuthorizationsClientTests.cs
View File

@@ -271,7 +271,7 @@ namespace Octokit.Tests.Clients
authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data); authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data);
Assert.NotNull(calledUri); Assert.NotNull(calledUri);
Assert.Equal(calledUri.ToString(), "authorizations/clients/clientId"); Assert.Equal("authorizations/clients/clientId", calledUri.ToString());
Assert.NotNull(calledBody); Assert.NotNull(calledBody);
var fingerprintProperty = ((IEnumerable<PropertyInfo>)calledBody.GetType().DeclaredProperties).FirstOrDefault(x => x.Name == "fingerprint"); var fingerprintProperty = ((IEnumerable<PropertyInfo>)calledBody.GetType().DeclaredProperties).FirstOrDefault(x => x.Name == "fingerprint");

4
Octokit.Tests/Clients/MiscellaneousClientTests.cs
View File

@@ -160,8 +160,8 @@ namespace Octokit.Tests.Clients
var result = await client.GetMetadata(); var result = await client.GetMetadata();
Assert.Equal(result.VerifiablePasswordAuthentication, false); Assert.False(result.VerifiablePasswordAuthentication);
Assert.Equal(result.GitHubServicesSha, "12345ABCDE"); Assert.Equal("12345ABCDE", result.GitHubServicesSha);
Assert.Equal(result.Hooks, new[] { "1.1.1.1/24", "1.1.1.2/24" }); Assert.Equal(result.Hooks, new[] { "1.1.1.1/24", "1.1.1.2/24" });
Assert.Equal(result.Git, new[] { "1.1.2.1/24", "1.1.2.2/24" }); Assert.Equal(result.Git, new[] { "1.1.2.1/24", "1.1.2.2/24" });
Assert.Equal(result.Pages, new[] { "1.1.3.1/24", "1.1.3.2/24" }); Assert.Equal(result.Pages, new[] { "1.1.3.1/24", "1.1.3.2/24" });

8
Octokit.Tests/Clients/OauthClientTests.cs
View File

@@ -140,10 +140,10 @@ public class OauthClientTests
var token = strategy.Deserialize<OauthToken>(responseText); var token = strategy.Deserialize<OauthToken>(responseText);
Assert.Equal(token.AccessToken, "token-goes-here"); Assert.Equal("token-goes-here", token.AccessToken);
Assert.Equal(token.TokenType, "bearer"); Assert.Equal("bearer", token.TokenType);
Assert.True(token.Scope.Contains("notifications")); Assert.Contains("notifications", token.Scope);
Assert.True(token.Scope.Contains("user:email")); Assert.Contains("user:email", token.Scope);
} }
} }
} }

2
Octokit.Tests/Helpers/StringExtensionsTests.cs
View File

@@ -70,7 +70,7 @@ namespace Octokit.Tests.Helpers
[Fact] [Fact]
public void EscapeDoubleQuotesReturnsNullForNullInput() public void EscapeDoubleQuotesReturnsNullForNullInput()
{ {
Assert.Equal(null, (null as string).EscapeDoubleQuotes()); Assert.Null((null as string).EscapeDoubleQuotes());
} }
[Fact] [Fact]

2
Octokit.Tests/Http/ApiInfoParserTests.cs
View File

@@ -86,7 +86,7 @@ namespace Octokit.Tests
public class ThePageUrlMethods public class ThePageUrlMethods
{ {
[Theory] [Theory]
[MemberData("PagingMethods")] [MemberData(nameof(PagingMethods))]
public void RetrievesTheCorrectPagePage(string linkName, Func<ApiInfo, Uri> pagingMethod) public void RetrievesTheCorrectPagePage(string linkName, Func<ApiInfo, Uri> pagingMethod)
{ {
var pageUri = new Uri("https://api.github.com/user/repos?page=2"); var pageUri = new Uri("https://api.github.com/user/repos?page=2");

2
Octokit.Tests/Models/MigrationTests.cs
View File

@@ -152,7 +152,7 @@ namespace Octokit.Tests.Models
Assert.Equal("octocat/Hello-World", _migrationReuqest.Repositories[0]); Assert.Equal("octocat/Hello-World", _migrationReuqest.Repositories[0]);
Assert.Equal(1, _migrationReuqest.Repositories.Count); Assert.Equal(1, _migrationReuqest.Repositories.Count);
Assert.Equal(true, _migrationReuqest.LockRepositories); Assert.True(_migrationReuqest.LockRepositories);
} }
} }
} }

34
Octokit.Tests/Models/NewRepositoryWebHookTests.cs
View File

@@ -11,23 +11,23 @@ namespace Octokit.Tests.Models
public void UsesDefaultValuesForDefaultConfig() public void UsesDefaultValuesForDefaultConfig()
{ {
var create = new NewRepositoryWebHook("windowsazure", new Dictionary<string, string>(), "http://test.com/example"); var create = new NewRepositoryWebHook("windowsazure", new Dictionary<string, string>(), "http://test.com/example");
Assert.Equal(create.Url, "http://test.com/example"); Assert.Equal("http://test.com/example", create.Url);
Assert.Equal(create.ContentType, WebHookContentType.Form); Assert.Equal(WebHookContentType.Form, create.ContentType);
Assert.Empty(create.Secret); Assert.Empty(create.Secret);
Assert.False(create.InsecureSsl); Assert.False(create.InsecureSsl);
var request = create.ToRequest(); var request = create.ToRequest();
Assert.Equal(request.Config.Count, 4); Assert.Equal(4, request.Config.Count);
Assert.True(request.Config.ContainsKey("url")); Assert.True(request.Config.ContainsKey("url"));
Assert.True(request.Config.ContainsKey("content_type")); Assert.True(request.Config.ContainsKey("content_type"));
Assert.True(request.Config.ContainsKey("secret")); Assert.True(request.Config.ContainsKey("secret"));
Assert.True(request.Config.ContainsKey("insecure_ssl")); Assert.True(request.Config.ContainsKey("insecure_ssl"));
Assert.Equal(request.Config["url"], "http://test.com/example"); Assert.Equal("http://test.com/example", request.Config["url"]);
Assert.Equal(request.Config["content_type"], WebHookContentType.Form.ToParameter()); Assert.Equal(request.Config["content_type"], WebHookContentType.Form.ToParameter());
Assert.Equal(request.Config["secret"], ""); Assert.Equal("", request.Config["secret"]);
Assert.Equal(request.Config["insecure_ssl"], "False"); Assert.Equal("False", request.Config["insecure_ssl"]);
} }
[Fact] [Fact]
@@ -47,23 +47,23 @@ namespace Octokit.Tests.Models
InsecureSsl = true InsecureSsl = true
}; };
Assert.Equal(create.Url, "http://test.com/example"); Assert.Equal("http://test.com/example", create.Url);
Assert.Equal(create.ContentType, WebHookContentType.Json); Assert.Equal(WebHookContentType.Json, create.ContentType);
Assert.Empty(create.Secret); Assert.Empty(create.Secret);
Assert.True(create.InsecureSsl); Assert.True(create.InsecureSsl);
var request = create.ToRequest(); var request = create.ToRequest();
Assert.Equal(request.Config.Count, 7); Assert.Equal(7, request.Config.Count);
Assert.True(request.Config.ContainsKey("url")); Assert.True(request.Config.ContainsKey("url"));
Assert.True(request.Config.ContainsKey("content_type")); Assert.True(request.Config.ContainsKey("content_type"));
Assert.True(request.Config.ContainsKey("secret")); Assert.True(request.Config.ContainsKey("secret"));
Assert.True(request.Config.ContainsKey("insecure_ssl")); Assert.True(request.Config.ContainsKey("insecure_ssl"));
Assert.Equal(request.Config["url"], "http://test.com/example"); Assert.Equal("http://test.com/example", request.Config["url"]);
Assert.Equal(request.Config["content_type"], WebHookContentType.Json.ToParameter()); Assert.Equal(request.Config["content_type"], WebHookContentType.Json.ToParameter());
Assert.Equal(request.Config["secret"], ""); Assert.Equal("", request.Config["secret"]);
Assert.Equal(request.Config["insecure_ssl"], true.ToString()); Assert.Equal(request.Config["insecure_ssl"], true.ToString());
Assert.True(request.Config.ContainsKey("hostname")); Assert.True(request.Config.ContainsKey("hostname"));
@@ -130,8 +130,8 @@ namespace Octokit.Tests.Models
var request = create.ToRequest(); var request = create.ToRequest();
var requestRepeated = create.ToRequest(); var requestRepeated = create.ToRequest();
Assert.Equal(request.Config.Count, 4); Assert.Equal(4, request.Config.Count);
Assert.Equal(requestRepeated.Config.Count, 4); Assert.Equal(4, requestRepeated.Config.Count);
} }
[Fact] [Fact]
@@ -151,8 +151,8 @@ namespace Octokit.Tests.Models
var requestRepeated = create.ToRequest(); var requestRepeated = create.ToRequest();
//This is not 8, because `url` used in config, is already part of the base config //This is not 8, because `url` used in config, is already part of the base config
Assert.Equal(request.Config.Count, 7); Assert.Equal(7, request.Config.Count);
Assert.Equal(requestRepeated.Config.Count, 7); Assert.Equal(7, requestRepeated.Config.Count);
} }
[Fact] [Fact]
@@ -167,10 +167,10 @@ namespace Octokit.Tests.Models
var request = create.ToRequest(); var request = create.ToRequest();
Assert.Equal(request.Config["url"], "http://test.com/example"); Assert.Equal("http://test.com/example", request.Config["url"]);
var subsequentRequest = create.ToRequest(); var subsequentRequest = create.ToRequest();
Assert.Equal(subsequentRequest.Config["url"], "http://test.com/example"); Assert.Equal("http://test.com/example", subsequentRequest.Config["url"]);
} }
} }
} }

26
Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
View File

@@ -28,7 +28,7 @@ public class SearchIssuesRequestExclusionsTests
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
// Ensure the specified parameter does not exist when not set // Ensure the specified parameter does not exist when not set
Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
// Set the parameter // Set the parameter
property.Value(request, "blah"); property.Value(request, "blah");
@@ -42,61 +42,61 @@ public class SearchIssuesRequestExclusionsTests
public void HandlesStateAttributeCorrectly() public void HandlesStateAttributeCorrectly()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-state:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-state:"));
request.State = ItemState.Closed; request.State = ItemState.Closed;
Assert.True(request.MergedQualifiers().Contains("-state:closed")); Assert.Contains("-state:closed", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesExcludeLabelsAttributeCorrectly() public void HandlesExcludeLabelsAttributeCorrectly()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-label:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-label:"));
request.Labels = new[] { "label1", "label2" }; request.Labels = new[] { "label1", "label2" };
Assert.True(request.MergedQualifiers().Contains("-label:label1")); Assert.Contains("-label:label1", request.MergedQualifiers());
Assert.True(request.MergedQualifiers().Contains("-label:label2")); Assert.Contains("-label:label2", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesLanguageAttributeCorrectly() public void HandlesLanguageAttributeCorrectly()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-language:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-language:"));
request.Language = Language.CSharp; request.Language = Language.CSharp;
Assert.True(request.MergedQualifiers().Contains("-language:CSharp")); Assert.Contains("-language:CSharp", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesStatusAttributeCorrectly() public void HandlesStatusAttributeCorrectly()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-status:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-status:"));
request.Status = CommitState.Error; request.Status = CommitState.Error;
Assert.True(request.MergedQualifiers().Contains("-status:error")); Assert.Contains("-status:error", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesMilestoneAttributeWithoutQuotes() public void HandlesMilestoneAttributeWithoutQuotes()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-milestone:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-milestone:"));
request.Milestone = "testMilestone"; request.Milestone = "testMilestone";
Assert.True(request.MergedQualifiers().Contains("-milestone:\"testMilestone\"")); Assert.Contains("-milestone:\"testMilestone\"", request.MergedQualifiers());
} }
[Fact] [Fact]
public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone() public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone()
{ {
var request = new SearchIssuesRequestExclusions(); var request = new SearchIssuesRequestExclusions();
Assert.False(request.MergedQualifiers().Any(x => x.Contains("-milestone:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-milestone:"));
request.Milestone = "\"testMilestone\""; request.Milestone = "\"testMilestone\"";
Assert.Contains<string>("-milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers()); Assert.Contains<string>("-milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers());

52
Octokit.Tests/Models/SearchIssuesRequestTests.cs
View File

@@ -50,7 +50,7 @@ public class SearchIssuesRequestTests
var request = new SearchIssuesRequest("query"); var request = new SearchIssuesRequest("query");
// Ensure the specified parameter does not exist when not set // Ensure the specified parameter does not exist when not set
Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
// Set the parameter // Set the parameter
property.Value(request, "blah"); property.Value(request, "blah");
@@ -76,7 +76,7 @@ public class SearchIssuesRequestTests
var request = new SearchIssuesRequest("query"); var request = new SearchIssuesRequest("query");
// Ensure the specified parameter does not exist when not set // Ensure the specified parameter does not exist when not set
Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
// Set the parameter // Set the parameter
property.Value(request, DateRange.GreaterThan(new DateTimeOffset(DateTime.Today.AddDays(-7)))); property.Value(request, DateRange.GreaterThan(new DateTimeOffset(DateTime.Today.AddDays(-7))));
@@ -90,48 +90,48 @@ public class SearchIssuesRequestTests
public void HandlesInAttributeCorrectly() public void HandlesInAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("in:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("in:"));
request.In = new List<IssueInQualifier> { IssueInQualifier.Body, IssueInQualifier.Comment }; request.In = new List<IssueInQualifier> { IssueInQualifier.Body, IssueInQualifier.Comment };
Assert.True(request.MergedQualifiers().Contains("in:body,comment")); Assert.Contains("in:body,comment", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesStateAttributeCorrectly() public void HandlesStateAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("state:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("state:"));
request.State = ItemState.Closed; request.State = ItemState.Closed;
Assert.True(request.MergedQualifiers().Contains("state:closed")); Assert.Contains("state:closed", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesLabelsAttributeCorrectly() public void HandlesLabelsAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("label:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("label:"));
request.Labels = new[] { "label1", "label2" }; request.Labels = new[] { "label1", "label2" };
Assert.True(request.MergedQualifiers().Contains("label:label1")); Assert.Contains("label:label1", request.MergedQualifiers());
Assert.True(request.MergedQualifiers().Contains("label:label2")); Assert.Contains("label:label2", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesMilestoneAttributeWithoutQuotes() public void HandlesMilestoneAttributeWithoutQuotes()
{ {
var request = new SearchIssuesRequest("text"); var request = new SearchIssuesRequest("text");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("milestone:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("milestone:"));
request.Milestone = "testMilestone"; request.Milestone = "testMilestone";
Assert.True(request.MergedQualifiers().Contains("milestone:\"testMilestone\"")); Assert.Contains("milestone:\"testMilestone\"", request.MergedQualifiers());
} }
[Fact] [Fact]
public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone() public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone()
{ {
var request = new SearchIssuesRequest("text"); var request = new SearchIssuesRequest("text");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("milestone:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("milestone:"));
request.Milestone = "\"testMilestone\""; request.Milestone = "\"testMilestone\"";
Assert.Contains<string>("milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers()); Assert.Contains<string>("milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers());
@@ -141,63 +141,63 @@ public class SearchIssuesRequestTests
public void HandlesNoMetadataAttributeCorrectly() public void HandlesNoMetadataAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("no:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("no:"));
request.No = IssueNoMetadataQualifier.Milestone; request.No = IssueNoMetadataQualifier.Milestone;
Assert.True(request.MergedQualifiers().Contains("no:milestone")); Assert.Contains("no:milestone", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesLanguageAttributeCorrectly() public void HandlesLanguageAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("language:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("language:"));
request.Language = Language.CSharp; request.Language = Language.CSharp;
Assert.True(request.MergedQualifiers().Contains("language:CSharp")); Assert.Contains("language:CSharp", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesIsAttributeCorrectly() public void HandlesIsAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("is:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("is:"));
request.Is = new List<IssueIsQualifier> { IssueIsQualifier.Merged, IssueIsQualifier.PullRequest }; request.Is = new List<IssueIsQualifier> { IssueIsQualifier.Merged, IssueIsQualifier.PullRequest };
Assert.True(request.MergedQualifiers().Contains("is:merged")); Assert.Contains("is:merged", request.MergedQualifiers());
Assert.True(request.MergedQualifiers().Contains("is:pr")); Assert.Contains("is:pr", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesStatusAttributeCorrectly() public void HandlesStatusAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("status:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("status:"));
request.Status = CommitState.Error; request.Status = CommitState.Error;
Assert.True(request.MergedQualifiers().Contains("status:error")); Assert.Contains("status:error", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesCommentsAttributeCorrectly() public void HandlesCommentsAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("comments:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("comments:"));
request.Comments = Range.GreaterThan(5); request.Comments = Range.GreaterThan(5);
Assert.True(request.MergedQualifiers().Contains("comments:>5")); Assert.Contains("comments:>5", request.MergedQualifiers());
} }
[Fact] [Fact]
public void HandlesRepoAttributeCorrectly() public void HandlesRepoAttributeCorrectly()
{ {
var request = new SearchIssuesRequest("test"); var request = new SearchIssuesRequest("test");
Assert.False(request.MergedQualifiers().Any(x => x.Contains("repo:"))); Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("repo:"));
request.Repos.Add("myorg", "repo1"); request.Repos.Add("myorg", "repo1");
request.Repos.Add("myorg", "repo2"); request.Repos.Add("myorg", "repo2");
Assert.True(request.MergedQualifiers().Contains("repo:myorg/repo1")); Assert.Contains("repo:myorg/repo1", request.MergedQualifiers());
Assert.True(request.MergedQualifiers().Contains("repo:myorg/repo2")); Assert.Contains("repo:myorg/repo2", request.MergedQualifiers());
} }
} }
} }

4
Octokit.Tests/SimpleJsonSerializerTests.cs
View File

@@ -91,7 +91,7 @@ namespace Octokit.Tests
var deserializeData = new SimpleJsonSerializer().Deserialize<string>(json); var deserializeData = new SimpleJsonSerializer().Deserialize<string>(json);
Assert.True(lastTabCharacter.ToString().Equals("\\t")); Assert.Equal("\\t", lastTabCharacter.ToString());
Assert.Equal(data, deserializeData); Assert.Equal(data, deserializeData);
} }
@@ -313,7 +313,7 @@ namespace Octokit.Tests
var sample = new SimpleJsonSerializer().Deserialize<Sample>(json); var sample = new SimpleJsonSerializer().Deserialize<Sample>(json);
Assert.Equal(0, sample.Id); Assert.Equal(0, sample.Id);
Assert.Equal(null, sample.FirstName); Assert.Null(sample.FirstName);
Assert.False(sample.IsSomething); Assert.False(sample.IsSomething);
Assert.True(sample.Private); Assert.True(sample.Private);
} }