From 1d6c1aee2588757d6561b9d2467e6d79e38e11f6 Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Mon, 18 May 2015 03:24:59 +0300 Subject: [PATCH] SshKeys, Statistics, Tags, Teams, Trees, Users --- Octokit.Tests/Clients/SshKeysClientTests.cs | 4 +-- .../Clients/StatisticsClientTests.cs | 20 +++++------ Octokit.Tests/Clients/TagsClientTests.cs | 22 ++++++------ Octokit.Tests/Clients/TeamsClientTests.cs | 8 ++--- Octokit.Tests/Clients/TreesClientTests.cs | 36 +++++++++---------- Octokit.Tests/Clients/UsersClientTests.cs | 6 ++-- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Octokit.Tests/Clients/SshKeysClientTests.cs b/Octokit.Tests/Clients/SshKeysClientTests.cs index 29c29af2..a9b833be 100644 --- a/Octokit.Tests/Clients/SshKeysClientTests.cs +++ b/Octokit.Tests/Clients/SshKeysClientTests.cs @@ -85,7 +85,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var userEndpoint = new SshKeysClient(Substitute.For()); - await AssertEx.Throws(() => userEndpoint.Update(1, null)); + await Assert.ThrowsAsync(() => userEndpoint.Update(1, null)); } } @@ -108,7 +108,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var userEndpoint = new SshKeysClient(Substitute.For()); - await AssertEx.Throws(() => userEndpoint.Create(null)); + await Assert.ThrowsAsync(() => userEndpoint.Create(null)); } } diff --git a/Octokit.Tests/Clients/StatisticsClientTests.cs b/Octokit.Tests/Clients/StatisticsClientTests.cs index 111534b4..9a1aba76 100644 --- a/Octokit.Tests/Clients/StatisticsClientTests.cs +++ b/Octokit.Tests/Clients/StatisticsClientTests.cs @@ -37,14 +37,14 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullOwner() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetContributors(null,"repositoryName")); + await Assert.ThrowsAsync(() => statisticsClient.GetContributors(null,"repositoryName")); } [Fact] public async Task ThrowsIfGivenNullRepositoryName() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetContributors("owner", null)); + await Assert.ThrowsAsync(() => statisticsClient.GetContributors("owner", null)); } } @@ -67,14 +67,14 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullOwner() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetCommitActivity(null, "repositoryName")); + await Assert.ThrowsAsync(() => statisticsClient.GetCommitActivity(null, "repositoryName")); } [Fact] public async Task ThrowsIfGivenNullRepositoryName() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetCommitActivity("owner", null)); + await Assert.ThrowsAsync(() => statisticsClient.GetCommitActivity("owner", null)); } } @@ -97,14 +97,14 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullOwner() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetCodeFrequency(null, "repositoryName")); + await Assert.ThrowsAsync(() => statisticsClient.GetCodeFrequency(null, "repositoryName")); } [Fact] public async Task ThrowsIfGivenNullRepositoryName() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetCodeFrequency("owner", null)); + await Assert.ThrowsAsync(() => statisticsClient.GetCodeFrequency("owner", null)); } } @@ -127,14 +127,14 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullOwner() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetParticipation(null, "repositoryName")); + await Assert.ThrowsAsync(() => statisticsClient.GetParticipation(null, "repositoryName")); } [Fact] public async Task ThrowsIfGivenNullRepositoryName() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetParticipation("owner", null)); + await Assert.ThrowsAsync(() => statisticsClient.GetParticipation("owner", null)); } } @@ -157,14 +157,14 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullOwner() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetPunchCard(null, "repositoryName")); + await Assert.ThrowsAsync(() => statisticsClient.GetPunchCard(null, "repositoryName")); } [Fact] public async Task ThrowsIfGivenNullRepositoryName() { var statisticsClient = new StatisticsClient(Substitute.For()); - await AssertEx.Throws(() => statisticsClient.GetPunchCard("owner", null)); + await Assert.ThrowsAsync(() => statisticsClient.GetPunchCard("owner", null)); } } } diff --git a/Octokit.Tests/Clients/TagsClientTests.cs b/Octokit.Tests/Clients/TagsClientTests.cs index acd13242..7a8ce5f3 100644 --- a/Octokit.Tests/Clients/TagsClientTests.cs +++ b/Octokit.Tests/Clients/TagsClientTests.cs @@ -27,12 +27,12 @@ public class TagsClientTests { var client = new TagsClient(Substitute.For()); - await AssertEx.Throws(async () => await client.Get(null, "name", "reference")); - await AssertEx.Throws(async () => await client.Get("owner", null, "reference")); - await AssertEx.Throws(async () => await client.Get("owner", "name", null)); - await AssertEx.Throws(async () => await client.Get("", "name", "reference")); - await AssertEx.Throws(async () => await client.Get("owner", "", "reference")); - await AssertEx.Throws(async () => await client.Get("owner", "name", "")); + await Assert.ThrowsAsync(() => client.Get(null, "name", "reference")); + await Assert.ThrowsAsync(() => client.Get("owner", null, "reference")); + await Assert.ThrowsAsync(() => client.Get("owner", "name", null)); + await Assert.ThrowsAsync(() => client.Get("", "name", "reference")); + await Assert.ThrowsAsync(() => client.Get("owner", "", "reference")); + await Assert.ThrowsAsync(() => client.Get("owner", "name", "")); } } @@ -55,11 +55,11 @@ public class TagsClientTests { var client = new TagsClient(Substitute.For()); - await AssertEx.Throws(async () => await client.Create(null, "name", new NewTag())); - await AssertEx.Throws(async () => await client.Create("owner", null, new NewTag())); - await AssertEx.Throws(async () => await client.Create("owner", "name", null)); - await AssertEx.Throws(async () => await client.Create("", "name", new NewTag())); - await AssertEx.Throws(async () => await client.Create("owner", "", new NewTag())); + await Assert.ThrowsAsync(() => client.Create(null, "name", new NewTag())); + await Assert.ThrowsAsync(() => client.Create("owner", null, new NewTag())); + await Assert.ThrowsAsync(() => client.Create("owner", "name", null)); + await Assert.ThrowsAsync(() => client.Create("", "name", new NewTag())); + await Assert.ThrowsAsync(() => client.Create("owner", "", new NewTag())); } } diff --git a/Octokit.Tests/Clients/TeamsClientTests.cs b/Octokit.Tests/Clients/TeamsClientTests.cs index 8fd45cfd..bf19eb67 100644 --- a/Octokit.Tests/Clients/TeamsClientTests.cs +++ b/Octokit.Tests/Clients/TeamsClientTests.cs @@ -129,7 +129,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new TeamsClient(connection); - AssertEx.Throws(() => client.IsMember(1, null)); + Assert.ThrowsAsync(() => client.IsMember(1, null)); } [Fact] @@ -138,7 +138,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new TeamsClient(connection); - AssertEx.Throws(() => client.IsMember(1, "")); + Assert.ThrowsAsync(() => client.IsMember(1, "")); } } @@ -213,7 +213,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new TeamsClient(connection); - AssertEx.Throws(() => client.AddRepository(1, null, "Repo Name")); + Assert.ThrowsAsync(() => client.AddRepository(1, null, "Repo Name")); } [Fact] @@ -222,7 +222,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new TeamsClient(connection); - AssertEx.Throws(() => client.AddRepository(1, "org name", null)); + Assert.ThrowsAsync(() => client.AddRepository(1, "org name", null)); } } diff --git a/Octokit.Tests/Clients/TreesClientTests.cs b/Octokit.Tests/Clients/TreesClientTests.cs index 88123121..fc876538 100644 --- a/Octokit.Tests/Clients/TreesClientTests.cs +++ b/Octokit.Tests/Clients/TreesClientTests.cs @@ -30,12 +30,12 @@ namespace Octokit.Tests { var client = new TreesClient(Substitute.For()); - await AssertEx.Throws(async () => await client.Get(null, "name", "123456ABCD")); - await AssertEx.Throws(async () => await client.Get("", "name", "123456ABCD")); - await AssertEx.Throws(async () => await client.Get("owner", null, "123456ABCD")); - await AssertEx.Throws(async () => await client.Get("owner", "", "123456ABCD")); - await AssertEx.Throws(async () => await client.Get("owner", "name", null)); - await AssertEx.Throws(async () => await client.Get("owner", "name", "")); + await Assert.ThrowsAsync(() => client.Get(null, "name", "123456ABCD")); + await Assert.ThrowsAsync(() => client.Get("", "name", "123456ABCD")); + await Assert.ThrowsAsync(() => client.Get("owner", null, "123456ABCD")); + await Assert.ThrowsAsync(() => client.Get("owner", "", "123456ABCD")); + await Assert.ThrowsAsync(() => client.Get("owner", "name", null)); + await Assert.ThrowsAsync(() => client.Get("owner", "name", "")); } } @@ -58,12 +58,12 @@ namespace Octokit.Tests { var client = new TreesClient(Substitute.For()); - await AssertEx.Throws(async () => await client.GetRecursive(null, "name", "123456ABCD")); - await AssertEx.Throws(async () => await client.GetRecursive("", "name", "123456ABCD")); - await AssertEx.Throws(async () => await client.GetRecursive("owner", null, "123456ABCD")); - await AssertEx.Throws(async () => await client.GetRecursive("owner", "", "123456ABCD")); - await AssertEx.Throws(async () => await client.GetRecursive("owner", "name", null)); - await AssertEx.Throws(async () => await client.GetRecursive("owner", "name", "")); + await Assert.ThrowsAsync(() => client.GetRecursive(null, "name", "123456ABCD")); + await Assert.ThrowsAsync(() => client.GetRecursive("", "name", "123456ABCD")); + await Assert.ThrowsAsync(() => client.GetRecursive("owner", null, "123456ABCD")); + await Assert.ThrowsAsync(() => client.GetRecursive("owner", "", "123456ABCD")); + await Assert.ThrowsAsync(() => client.GetRecursive("owner", "name", null)); + await Assert.ThrowsAsync(() => client.GetRecursive("owner", "name", "")); } } @@ -87,10 +87,10 @@ namespace Octokit.Tests var connection = Substitute.For(); var client = new TreesClient(connection); - await AssertEx.Throws(async () => await client.Create(null, "name", new NewTree())); - await AssertEx.Throws(async () => await client.Create("", "name", new NewTree())); - await AssertEx.Throws(async () => await client.Create("owner", null, new NewTree())); - await AssertEx.Throws(async () => await client.Create("owner", "", new NewTree())); + await Assert.ThrowsAsync(() => client.Create(null, "name", new NewTree())); + await Assert.ThrowsAsync(() => client.Create("", "name", new NewTree())); + await Assert.ThrowsAsync(() => client.Create("owner", null, new NewTree())); + await Assert.ThrowsAsync(() => client.Create("owner", "", new NewTree())); } [Fact] @@ -102,8 +102,8 @@ namespace Octokit.Tests var connection = Substitute.For(); var client = new TreesClient(connection); - await AssertEx.Throws( - async () => await client.Create("fake", "repo", newTree)); + await Assert.ThrowsAsync( + () => client.Create("fake", "repo", newTree)); } } diff --git a/Octokit.Tests/Clients/UsersClientTests.cs b/Octokit.Tests/Clients/UsersClientTests.cs index 579f9685..2b83453e 100644 --- a/Octokit.Tests/Clients/UsersClientTests.cs +++ b/Octokit.Tests/Clients/UsersClientTests.cs @@ -44,7 +44,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullUser() { var userEndpoint = new UsersClient(Substitute.For()); - await AssertEx.Throws(() => userEndpoint.Get(null)); + await Assert.ThrowsAsync(() => userEndpoint.Get(null)); } } @@ -66,7 +66,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsIfGivenNullUser() { var userEndpoint = new UsersClient(Substitute.For()); - await AssertEx.Throws(() => userEndpoint.Get(null)); + await Assert.ThrowsAsync(() => userEndpoint.Get(null)); } } @@ -88,7 +88,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var userEndpoint = new UsersClient(Substitute.For()); - await AssertEx.Throws(() => userEndpoint.Update(null)); + await Assert.ThrowsAsync(() => userEndpoint.Update(null)); } }