From 5ff6c1156fd9bfcbd0034f3675b57f2574033ca3 Mon Sep 17 00:00:00 2001 From: Mordechai Zuber Date: Tue, 19 May 2015 11:24:27 +0300 Subject: [PATCH] O-Blob, O-Commits, O-Events --- .../Reactive/ObservableBlobClientTests.cs | 23 +++++----- .../Reactive/ObservableCommitsClientTests.cs | 23 +++++----- .../Reactive/ObservableEventsClientTests.cs | 45 ++++++++++--------- 3 files changed, 47 insertions(+), 44 deletions(-) diff --git a/Octokit.Tests/Reactive/ObservableBlobClientTests.cs b/Octokit.Tests/Reactive/ObservableBlobClientTests.cs index e914471c..c186d700 100644 --- a/Octokit.Tests/Reactive/ObservableBlobClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableBlobClientTests.cs @@ -1,5 +1,6 @@ using System; using System.Reactive.Linq; +using System.Reactive.Threading.Tasks; using System.Threading.Tasks; using NSubstitute; using Octokit.Reactive; @@ -28,12 +29,12 @@ namespace Octokit.Tests.Reactive { var client = new ObservableBlobClient(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").ToTask()); + await Assert.ThrowsAsync(() => client.Get("", "name", "123456ABCD").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", null, "123456ABCD").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "", "123456ABCD").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "name", null).ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "name", "").ToTask()); } } @@ -57,11 +58,11 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableBlobClient(gitHubClient); - await AssertEx.Throws(async () => await client.Create(null, "name", new NewBlob())); - await AssertEx.Throws(async () => await client.Create("", "name", new NewBlob())); - await AssertEx.Throws(async () => await client.Create("owner", null, new NewBlob())); - await AssertEx.Throws(async () => await client.Create("owner", "", new NewBlob())); - await AssertEx.Throws(async () => await client.Create("owner", "name", null)); + await Assert.ThrowsAsync(() => client.Create(null, "name", new NewBlob()).ToTask()); + await Assert.ThrowsAsync(() => client.Create("", "name", new NewBlob()).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", null, new NewBlob()).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", "", new NewBlob()).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", "name", null).ToTask()); } } diff --git a/Octokit.Tests/Reactive/ObservableCommitsClientTests.cs b/Octokit.Tests/Reactive/ObservableCommitsClientTests.cs index aec9ddcc..0636cebc 100644 --- a/Octokit.Tests/Reactive/ObservableCommitsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableCommitsClientTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Reactive.Linq; +using System.Reactive.Threading.Tasks; using System.Threading.Tasks; using NSubstitute; using Octokit.Reactive; @@ -27,12 +28,12 @@ namespace Octokit.Tests.Reactive { var client = new ObservableCommitsClient(Substitute.For()); - await AssertEx.Throws(async () => await client.Get(null, "name", "")); - await AssertEx.Throws(async () => await client.Get("owner", null, "")); - 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", "").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", null, "").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "name", null).ToTask()); + await Assert.ThrowsAsync(() => client.Get("", "name", "reference").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "", "reference").ToTask()); + await Assert.ThrowsAsync(() => client.Get("owner", "name", "").ToTask()); } [Fact] @@ -55,11 +56,11 @@ namespace Octokit.Tests.Reactive var client = new ObservableCommitsClient(Substitute.For()); var newCommit = new NewCommit("message", "tree", new[] { "parent1", "parent2" }); - await AssertEx.Throws(async () => await client.Create(null, "name", newCommit)); - await AssertEx.Throws(async () => await client.Create("owner", null, newCommit)); - await AssertEx.Throws(async () => await client.Create("owner", "name", null)); - await AssertEx.Throws(async () => await client.Create("", "name", newCommit)); - await AssertEx.Throws(async () => await client.Create("owner", "", newCommit)); + await Assert.ThrowsAsync(() => client.Create(null, "name", newCommit).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", null, newCommit).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", "name", null).ToTask()); + await Assert.ThrowsAsync(() => client.Create("", "name", newCommit).ToTask()); + await Assert.ThrowsAsync(() => client.Create("owner", "", newCommit).ToTask()); } [Fact] diff --git a/Octokit.Tests/Reactive/ObservableEventsClientTests.cs b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs index f13e0a33..0c8d7e64 100644 --- a/Octokit.Tests/Reactive/ObservableEventsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Reactive.Linq; +using System.Reactive.Threading.Tasks; using System.Threading.Tasks; using NSubstitute; using Octokit.Reactive; @@ -44,10 +45,10 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllForRepository(null, "name")); - await AssertEx.Throws(async () => await client.GetAllForRepository("", "name")); - await AssertEx.Throws(async () => await client.GetAllForRepository("owner", null)); - await AssertEx.Throws(async () => await client.GetAllForRepository("owner", "")); + await Assert.ThrowsAsync(() => client.GetAllForRepository(null, "name").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepository("", "name").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepository("owner", null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepository("owner", "").ToTask()); } } @@ -70,10 +71,10 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork(null, "name")); - await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("", "name")); - await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("owner", null)); - await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("owner", "")); + await Assert.ThrowsAsync(() => client.GetAllForRepositoryNetwork(null, "name").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepositoryNetwork("", "name").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepositoryNetwork("owner", null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForRepositoryNetwork("owner", "").ToTask()); } } @@ -96,8 +97,8 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllForOrganization(null)); - await AssertEx.Throws(async () => await client.GetAllForOrganization("")); + await Assert.ThrowsAsync(() => client.GetAllForOrganization(null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForOrganization("").ToTask()); } } @@ -120,8 +121,8 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllUserReceived(null)); - await AssertEx.Throws(async () => await client.GetAllUserReceived("")); + await Assert.ThrowsAsync(() => client.GetAllUserReceived(null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllUserReceived("").ToTask()); } } @@ -144,8 +145,8 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllUserReceivedPublic(null)); - await AssertEx.Throws(async () => await client.GetAllUserReceivedPublic("")); + await Assert.ThrowsAsync(() => client.GetAllUserReceivedPublic(null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllUserReceivedPublic("").ToTask()); } } @@ -168,8 +169,8 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllUserPerformed(null)); - await AssertEx.Throws(async () => await client.GetAllUserPerformed("")); + await Assert.ThrowsAsync(() => client.GetAllUserPerformed(null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllUserPerformed("").ToTask()); } } @@ -192,8 +193,8 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllUserPerformedPublic(null)); - await AssertEx.Throws(async () => await client.GetAllUserPerformedPublic("")); + await Assert.ThrowsAsync(() => client.GetAllUserPerformedPublic(null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllUserPerformedPublic("").ToTask()); } } @@ -216,10 +217,10 @@ namespace Octokit.Tests.Reactive var gitHubClient = Substitute.For(); var client = new ObservableEventsClient(gitHubClient); - await AssertEx.Throws(async () => await client.GetAllForAnOrganization(null, "org")); - await AssertEx.Throws(async () => await client.GetAllForAnOrganization("", "org")); - await AssertEx.Throws(async () => await client.GetAllForAnOrganization("fake", null)); - await AssertEx.Throws(async () => await client.GetAllForAnOrganization("fake", "")); + await Assert.ThrowsAsync(() => client.GetAllForAnOrganization(null, "org").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForAnOrganization("", "org").ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForAnOrganization("fake", null).ToTask()); + await Assert.ThrowsAsync(() => client.GetAllForAnOrganization("fake", "").ToTask()); } } }