From 91f728e5d598a41a6219dca8a534a2834e72abdb Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Mon, 11 May 2015 17:57:56 +0300 Subject: [PATCH] OrganizationMembersClient, PullRequestReviewC... --- .../Clients/OrganizationMembersClientTests.cs | 46 ++++++------- .../PullRequestReviewCommentsClientTests.cs | 64 +++++++++---------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs index 1e98c6f8..d1040fb2 100644 --- a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs +++ b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs @@ -126,7 +126,7 @@ namespace Octokit.Tests.Clients apiConnection.Connection.Returns(connection); var client = new OrganizationMembersClient(apiConnection); - await AssertEx.Throws(async () => await client.CheckMember("org", "username")); + await Assert.ThrowsAsync(() => client.CheckMember("org", "username")); } [Fact] @@ -134,10 +134,10 @@ namespace Octokit.Tests.Clients { var orgMembers = new OrganizationMembersClient(Substitute.For()); - await AssertEx.Throws(async () => await orgMembers.CheckMember(null, "username")); - await AssertEx.Throws(async () => await orgMembers.CheckMember(null, "")); - await AssertEx.Throws(async () => await orgMembers.CheckMember("org", null)); - await AssertEx.Throws(async () => await orgMembers.CheckMember("", null)); + await Assert.ThrowsAsync(() => orgMembers.CheckMember(null, "username")); + await Assert.ThrowsAsync(() => orgMembers.CheckMember(null, "")); + await Assert.ThrowsAsync(() => orgMembers.CheckMember("org", null)); + await Assert.ThrowsAsync(() => orgMembers.CheckMember("", null)); } } @@ -174,7 +174,7 @@ namespace Octokit.Tests.Clients apiConnection.Connection.Returns(connection); var client = new OrganizationMembersClient(apiConnection); - await AssertEx.Throws(async () => await client.CheckMemberPublic("org", "username")); + await Assert.ThrowsAsync(() => client.CheckMemberPublic("org", "username")); } [Fact] @@ -182,10 +182,10 @@ namespace Octokit.Tests.Clients { var orgMembers = new OrganizationMembersClient(Substitute.For()); - await AssertEx.Throws(async () => await orgMembers.CheckMemberPublic(null, "username")); - await AssertEx.Throws(async () => await orgMembers.CheckMemberPublic("", "username")); - await AssertEx.Throws(async () => await orgMembers.CheckMemberPublic("org", null)); - await AssertEx.Throws(async () => await orgMembers.CheckMemberPublic("org", "")); + await Assert.ThrowsAsync(() => orgMembers.CheckMemberPublic(null, "username")); + await Assert.ThrowsAsync(() => orgMembers.CheckMemberPublic("", "username")); + await Assert.ThrowsAsync(() => orgMembers.CheckMemberPublic("org", null)); + await Assert.ThrowsAsync(() => orgMembers.CheckMemberPublic("org", "")); } } @@ -207,10 +207,10 @@ namespace Octokit.Tests.Clients { var orgMembers = new OrganizationMembersClient(Substitute.For()); - await AssertEx.Throws(async () => await orgMembers.Delete(null, "username")); - await AssertEx.Throws(async () => await orgMembers.Delete("", "username")); - await AssertEx.Throws(async () => await orgMembers.Delete("org", null)); - await AssertEx.Throws(async () => await orgMembers.Delete("org", "")); + await Assert.ThrowsAsync(() => orgMembers.Delete(null, "username")); + await Assert.ThrowsAsync(() => orgMembers.Delete("", "username")); + await Assert.ThrowsAsync(() => orgMembers.Delete("org", null)); + await Assert.ThrowsAsync(() => orgMembers.Delete("org", "")); } } @@ -246,7 +246,7 @@ namespace Octokit.Tests.Clients apiConnection.Connection.Returns(connection); var client = new OrganizationMembersClient(apiConnection); - await AssertEx.Throws(async () => await client.Publicize("org", "username")); + await Assert.ThrowsAsync(() => client.Publicize("org", "username")); } [Fact] @@ -254,10 +254,10 @@ namespace Octokit.Tests.Clients { var orgMembers = new OrganizationMembersClient(Substitute.For()); - await AssertEx.Throws(async () => await orgMembers.Publicize(null, "username")); - await AssertEx.Throws(async () => await orgMembers.Publicize("", "username")); - await AssertEx.Throws(async () => await orgMembers.Publicize("org", null)); - await AssertEx.Throws(async () => await orgMembers.Publicize("org", "")); + await Assert.ThrowsAsync(() => orgMembers.Publicize(null, "username")); + await Assert.ThrowsAsync(() => orgMembers.Publicize("", "username")); + await Assert.ThrowsAsync(() => orgMembers.Publicize("org", null)); + await Assert.ThrowsAsync(() => orgMembers.Publicize("org", "")); } } @@ -279,10 +279,10 @@ namespace Octokit.Tests.Clients { var orgMembers = new OrganizationMembersClient(Substitute.For()); - await AssertEx.Throws(async () => await orgMembers.Conceal(null, "username")); - await AssertEx.Throws(async () => await orgMembers.Conceal("", "username")); - await AssertEx.Throws(async () => await orgMembers.Conceal("org", null)); - await AssertEx.Throws(async () => await orgMembers.Conceal("org", "")); + await Assert.ThrowsAsync(() => orgMembers.Conceal(null, "username")); + await Assert.ThrowsAsync(() => orgMembers.Conceal("", "username")); + await Assert.ThrowsAsync(() => orgMembers.Conceal("org", null)); + await Assert.ThrowsAsync(() => orgMembers.Conceal("org", "")); } } } diff --git a/Octokit.Tests/Clients/PullRequestReviewCommentsClientTests.cs b/Octokit.Tests/Clients/PullRequestReviewCommentsClientTests.cs index 86408b1e..c6318773 100644 --- a/Octokit.Tests/Clients/PullRequestReviewCommentsClientTests.cs +++ b/Octokit.Tests/Clients/PullRequestReviewCommentsClientTests.cs @@ -100,10 +100,10 @@ public class PullRequestReviewCommentsClientTests var connection = Substitute.For(); var client = new PullRequestReviewCommentsClient(connection); - await AssertEx.Throws(async () => await client.GetAll(null, "name", 1)); - await AssertEx.Throws(async () => await client.GetAll("", "name", 1)); - await AssertEx.Throws(async () => await client.GetAll("owner", null, 1)); - await AssertEx.Throws(async () => await client.GetAll("owner", "", 1)); + await Assert.ThrowsAsync(() => client.GetAll(null, "name", 1)); + await Assert.ThrowsAsync(() => client.GetAll("", "name", 1)); + await Assert.ThrowsAsync(() => client.GetAll("owner", null, 1)); + await Assert.ThrowsAsync(() => client.GetAll("owner", "", 1)); } } @@ -152,11 +152,11 @@ public class PullRequestReviewCommentsClientTests var request = new PullRequestReviewCommentRequest(); - await AssertEx.Throws(async () => await client.GetAllForRepository(null, "name", request)); - await AssertEx.Throws(async () => await client.GetAllForRepository("", "name", request)); - await AssertEx.Throws(async () => await client.GetAllForRepository("owner", null, request)); - await AssertEx.Throws(async () => await client.GetAllForRepository("owner", "", request)); - await AssertEx.Throws(async () => await client.GetAllForRepository("owner", "name", null)); + await Assert.ThrowsAsync(() => client.GetAllForRepository(null, "name", request)); + await Assert.ThrowsAsync(() => client.GetAllForRepository("", "name", request)); + await Assert.ThrowsAsync(() => client.GetAllForRepository("owner", null, request)); + await Assert.ThrowsAsync(() => client.GetAllForRepository("owner", "", request)); + await Assert.ThrowsAsync(() => client.GetAllForRepository("owner", "name", null)); } [Fact] @@ -189,10 +189,10 @@ public class PullRequestReviewCommentsClientTests { var client = new PullRequestReviewCommentsClient(Substitute.For()); - await AssertEx.Throws(async () => await client.GetComment(null, "name", 1)); - await AssertEx.Throws(async () => await client.GetComment("", "name", 1)); - await AssertEx.Throws(async () => await client.GetComment("owner", null, 1)); - await AssertEx.Throws(async () => await client.GetComment("owner", "", 1)); + await Assert.ThrowsAsync(() => client.GetComment(null, "name", 1)); + await Assert.ThrowsAsync(() => client.GetComment("", "name", 1)); + await Assert.ThrowsAsync(() => client.GetComment("owner", null, 1)); + await Assert.ThrowsAsync(() => client.GetComment("owner", "", 1)); } } @@ -225,11 +225,11 @@ public class PullRequestReviewCommentsClientTests var comment = new PullRequestReviewCommentCreate(body, commitId, path, position); - await AssertEx.Throws(async () => await client.Create(null, "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.Create("", "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.Create("fakeOwner", null, 1, comment)); - await AssertEx.Throws(async () => await client.Create("fakeOwner", "", 1, comment)); - await AssertEx.Throws(async () => await client.Create("fakeOwner", "fakeRepoName", 1, null)); + await Assert.ThrowsAsync(() => client.Create(null, "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.Create("", "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.Create("fakeOwner", null, 1, comment)); + await Assert.ThrowsAsync(() => client.Create("fakeOwner", "", 1, comment)); + await Assert.ThrowsAsync(() => client.Create("fakeOwner", "fakeRepoName", 1, null)); } } @@ -260,11 +260,11 @@ public class PullRequestReviewCommentsClientTests var comment = new PullRequestReviewCommentReplyCreate(body, inReplyTo); - await AssertEx.Throws(async () => await client.CreateReply(null, "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.CreateReply("", "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.CreateReply("fakeOwner", null, 1, comment)); - await AssertEx.Throws(async () => await client.CreateReply("fakeOwner", "", 1, comment)); - await AssertEx.Throws(async () => await client.CreateReply("fakeOwner", "fakeRepoName", 1, null)); + await Assert.ThrowsAsync(() => client.CreateReply(null, "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.CreateReply("", "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.CreateReply("fakeOwner", null, 1, comment)); + await Assert.ThrowsAsync(() => client.CreateReply("fakeOwner", "", 1, comment)); + await Assert.ThrowsAsync(() => client.CreateReply("fakeOwner", "fakeRepoName", 1, null)); } } @@ -293,11 +293,11 @@ public class PullRequestReviewCommentsClientTests var comment = new PullRequestReviewCommentEdit(body); - await AssertEx.Throws(async () => await client.Edit(null, "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.Edit("", "fakeRepoName", 1, comment)); - await AssertEx.Throws(async () => await client.Edit("fakeOwner", null, 1, comment)); - await AssertEx.Throws(async () => await client.Edit("fakeOwner", "", 1, comment)); - await AssertEx.Throws(async () => await client.Edit("fakeOwner", null, 1, null)); + await Assert.ThrowsAsync(() => client.Edit(null, "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.Edit("", "fakeRepoName", 1, comment)); + await Assert.ThrowsAsync(() => client.Edit("fakeOwner", null, 1, comment)); + await Assert.ThrowsAsync(() => client.Edit("fakeOwner", "", 1, comment)); + await Assert.ThrowsAsync(() => client.Edit("fakeOwner", null, 1, null)); } } @@ -320,10 +320,10 @@ public class PullRequestReviewCommentsClientTests var connection = Substitute.For(); var client = new PullRequestReviewCommentsClient(connection); - await AssertEx.Throws(async () => await client.Delete(null, "fakeRepoName", 1)); - await AssertEx.Throws(async () => await client.Delete("", "fakeRepoName", 1)); - await AssertEx.Throws(async () => await client.Delete("fakeOwner", null, 1)); - await AssertEx.Throws(async () => await client.Delete("fakeOwner", "", 1)); + await Assert.ThrowsAsync(() => client.Delete(null, "fakeRepoName", 1)); + await Assert.ThrowsAsync(() => client.Delete("", "fakeRepoName", 1)); + await Assert.ThrowsAsync(() => client.Delete("fakeOwner", null, 1)); + await Assert.ThrowsAsync(() => client.Delete("fakeOwner", "", 1)); } } }