From d731f1bd971f4709c3b0ce48c62ee2de2dcaa456 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Wed, 30 Apr 2014 21:47:34 -0700 Subject: [PATCH] More jacked up tests --- Octokit.Tests/Clients/FollowersClientTests.cs | 12 +++++----- Octokit.Tests/Clients/GistsClientTests.cs | 4 ++-- Octokit.Tests/Clients/OauthClientTests.cs | 2 +- Octokit.Tests/Clients/WatchedClientTests.cs | 2 +- .../ObservableDeploymentStatusClientTests.cs | 4 ++-- .../ObservableDeploymentsClientTests.cs | 4 ++-- .../Reactive/ObservableEventsClientTests.cs | 18 +++++++------- .../Reactive/ObservableFollowersTest.cs | 8 +++---- .../ObservableIssueCommentsClientTests.cs | 4 ++-- .../Reactive/ObservableIssuesClientTests.cs | 24 +++++++++---------- .../ObservableMilestonesClientTests.cs | 12 +++++----- ...bservableOrganizationMembersClientTests.cs | 4 ++-- .../ObservablePullRequestsClientTests.cs | 14 +++++------ .../Reactive/ObservableReleasesClientTests.cs | 6 ++--- .../ObservableRepositoriesClientTests.cs | 24 +++++++++---------- .../Reactive/ObservableStarredClientTests.cs | 6 ++--- 16 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Octokit.Tests/Clients/FollowersClientTests.cs b/Octokit.Tests/Clients/FollowersClientTests.cs index f013782f..3d2fddd2 100644 --- a/Octokit.Tests/Clients/FollowersClientTests.cs +++ b/Octokit.Tests/Clients/FollowersClientTests.cs @@ -114,7 +114,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = status }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), + connection.Get(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -131,7 +131,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = HttpStatusCode.Conflict }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), + connection.Get(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -161,7 +161,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = status }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), + connection.Get(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -178,7 +178,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = HttpStatusCode.Conflict }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), + connection.Get(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -210,7 +210,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = status }); var connection = Substitute.For(); - connection.PutAsync(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), + connection.Put(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), Args.Object).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -227,7 +227,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = HttpStatusCode.Conflict }); var connection = Substitute.For(); - connection.PutAsync(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), + connection.Put(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), new { }).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); diff --git a/Octokit.Tests/Clients/GistsClientTests.cs b/Octokit.Tests/Clients/GistsClientTests.cs index 69eb025c..53c56a68 100644 --- a/Octokit.Tests/Clients/GistsClientTests.cs +++ b/Octokit.Tests/Clients/GistsClientTests.cs @@ -199,7 +199,7 @@ public class GistsClientTests var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = status }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "gists/1/star"), + connection.Get(Arg.Is(u => u.ToString() == "gists/1/star"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); @@ -216,7 +216,7 @@ public class GistsClientTests var response = Task.Factory.StartNew>(() => new ApiResponse { StatusCode = HttpStatusCode.Conflict }); var connection = Substitute.For(); - connection.GetAsync(Arg.Is(u => u.ToString() == "gists/1/star"), + connection.Get(Arg.Is(u => u.ToString() == "gists/1/star"), null, null).Returns(response); var apiConnection = Substitute.For(); apiConnection.Connection.Returns(connection); diff --git a/Octokit.Tests/Clients/OauthClientTests.cs b/Octokit.Tests/Clients/OauthClientTests.cs index 8fdeebea..95bc09ea 100644 --- a/Octokit.Tests/Clients/OauthClientTests.cs +++ b/Octokit.Tests/Clients/OauthClientTests.cs @@ -60,7 +60,7 @@ public class OauthClientTests Uri calledUri = null; FormUrlEncodedContent calledBody = null; Uri calledHostAddress = null; - connection.PostAsync( + connection.Post( Arg.Do(uri => calledUri = uri), Arg.Do(body => calledBody = body as FormUrlEncodedContent), "application/json", diff --git a/Octokit.Tests/Clients/WatchedClientTests.cs b/Octokit.Tests/Clients/WatchedClientTests.cs index f1103898..32329f47 100644 --- a/Octokit.Tests/Clients/WatchedClientTests.cs +++ b/Octokit.Tests/Clients/WatchedClientTests.cs @@ -116,7 +116,7 @@ namespace Octokit.Tests.Clients var response = Task.Factory.StartNew(() => status); var connection = Substitute.For(); - connection.DeleteAsync(Arg.Is(u => u.ToString() == "repos/yes/no/subscription")) + connection.Delete(Arg.Is(u => u.ToString() == "repos/yes/no/subscription")) .Returns(response); var apiConnection = Substitute.For(); diff --git a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs index 44a34c6d..2f3fb51f 100644 --- a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs @@ -56,7 +56,7 @@ namespace Octokit.Tests.Reactive _client.GetAll("owner", "repo", 1); _githubClient.Connection.Received(1) - .GetAsync>(Arg.Is(expectedUri), + .Get>(Arg.Is(expectedUri), Arg.Any>(), Arg.Any()); } @@ -68,7 +68,7 @@ namespace Octokit.Tests.Reactive _githubClient.Connection .Received(1) - .GetAsync>(Arg.Any(), + .Get>(Arg.Any(), Arg.Any>(), Arg.Is(ExpectedAcceptHeader)); } diff --git a/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs b/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs index 0964cde8..0e695046 100644 --- a/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs @@ -56,7 +56,7 @@ namespace Octokit.Tests.Reactive _client.GetAll("owner", "repo"); _githubClient.Connection .Received(1) - .GetAsync>(Arg.Is(expectedUri), + .Get>(Arg.Is(expectedUri), Arg.Any>(), Arg.Any()); } @@ -66,7 +66,7 @@ namespace Octokit.Tests.Reactive { _client.GetAll("owner", "repo"); _githubClient.Connection.Received(1) - .GetAsync>(Arg.Any(), + .Get>(Arg.Any(), Arg.Any>(), ExpectedAcceptHeader); } diff --git a/Octokit.Tests/Reactive/ObservableEventsClientTests.cs b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs index a4ce9105..5bce382a 100644 --- a/Octokit.Tests/Reactive/ObservableEventsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs @@ -21,7 +21,7 @@ namespace Octokit.Tests.Reactive client.GetAll(); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("events", UriKind.Relative), null, null); } } @@ -35,7 +35,7 @@ namespace Octokit.Tests.Reactive client.GetAllForRepository("fake", "repo"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("repos/fake/repo/issues/events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("repos/fake/repo/issues/events", UriKind.Relative), null, null); } [Fact] @@ -61,7 +61,7 @@ namespace Octokit.Tests.Reactive client.GetAllForRepositoryNetwork("fake", "repo"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("networks/fake/repo/events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("networks/fake/repo/events", UriKind.Relative), null, null); } [Fact] @@ -87,7 +87,7 @@ namespace Octokit.Tests.Reactive client.GetAllForOrganization("fake"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("orgs/fake/events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("orgs/fake/events", UriKind.Relative), null, null); } [Fact] @@ -111,7 +111,7 @@ namespace Octokit.Tests.Reactive client.GetUserReceived("fake"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("users/fake/received_events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("users/fake/received_events", UriKind.Relative), null, null); } [Fact] @@ -135,7 +135,7 @@ namespace Octokit.Tests.Reactive client.GetUserReceivedPublic("fake"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("users/fake/received_events/public", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("users/fake/received_events/public", UriKind.Relative), null, null); } [Fact] @@ -159,7 +159,7 @@ namespace Octokit.Tests.Reactive client.GetUserPerformed("fake"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("users/fake/events", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("users/fake/events", UriKind.Relative), null, null); } [Fact] @@ -183,7 +183,7 @@ namespace Octokit.Tests.Reactive client.GetUserPerformedPublic("fake"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("users/fake/events/public", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("users/fake/events/public", UriKind.Relative), null, null); } [Fact] @@ -207,7 +207,7 @@ namespace Octokit.Tests.Reactive client.GetForAnOrganization("fake", "org"); - gitHubClient.Connection.Received(1).GetAsync>(new Uri("users/fake/events/orgs/org", UriKind.Relative), null, null); + gitHubClient.Connection.Received(1).Get>(new Uri("users/fake/events/orgs/org", UriKind.Relative), null, null); } [Fact] diff --git a/Octokit.Tests/Reactive/ObservableFollowersTest.cs b/Octokit.Tests/Reactive/ObservableFollowersTest.cs index 65a5db1b..30c8d689 100644 --- a/Octokit.Tests/Reactive/ObservableFollowersTest.cs +++ b/Octokit.Tests/Reactive/ObservableFollowersTest.cs @@ -23,7 +23,7 @@ namespace Octokit.Tests.Reactive client.GetAllForCurrent(); - githubClient.Connection.Received(1).GetAsync>( + githubClient.Connection.Received(1).Get>( new Uri("user/followers", UriKind.Relative), null, null); } } @@ -38,7 +38,7 @@ namespace Octokit.Tests.Reactive client.GetAll("alfhenrik"); - githubClient.Connection.Received(1).GetAsync>( + githubClient.Connection.Received(1).Get>( new Uri("users/alfhenrik/followers", UriKind.Relative), null, null); } @@ -62,7 +62,7 @@ namespace Octokit.Tests.Reactive client.GetFollowingForCurrent(); - githubClient.Connection.Received(1).GetAsync>( + githubClient.Connection.Received(1).Get>( new Uri("user/following", UriKind.Relative), null, null); } } @@ -77,7 +77,7 @@ namespace Octokit.Tests.Reactive client.GetFollowing("alfhenrik"); - githubClient.Connection.Received(1).GetAsync>( + githubClient.Connection.Received(1).Get>( new Uri("users/alfhenrik/following", UriKind.Relative), null, null); } diff --git a/Octokit.Tests/Reactive/ObservableIssueCommentsClientTests.cs b/Octokit.Tests/Reactive/ObservableIssueCommentsClientTests.cs index fd17c9b2..cf62a70d 100644 --- a/Octokit.Tests/Reactive/ObservableIssueCommentsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableIssueCommentsClientTests.cs @@ -47,7 +47,7 @@ namespace Octokit.Tests.Reactive client.GetForRepository("fake", "repo"); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("repos/fake/repo/issues/comments", UriKind.Relative), null, null); } @@ -74,7 +74,7 @@ namespace Octokit.Tests.Reactive client.GetForIssue("fake", "repo", 3); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("repos/fake/repo/issues/3/comments", UriKind.Relative), null, null); } diff --git a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs index b378991e..9f010265 100644 --- a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs @@ -75,16 +75,16 @@ using Xunit; ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 4 && d["direction"] == "desc" && d["state"] == "open" && d["sort"] == "created" && d["filter"] == "assigned"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableIssuesClient(gitHubClient); @@ -136,16 +136,16 @@ using Xunit; ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 4 && d["direction"] == "desc" && d["state"] == "open" && d["sort"] == "created" && d["filter"] == "assigned"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableIssuesClient(gitHubClient); @@ -197,16 +197,16 @@ using Xunit; ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 4 && d["direction"] == "desc" && d["state"] == "open" && d["sort"] == "created" && d["filter"] == "assigned"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableIssuesClient(gitHubClient); @@ -258,16 +258,16 @@ using Xunit; ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 4 && d["direction"] == "desc" && d["state"] == "open" && d["sort"] == "created" && d["filter"] == "assigned"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableIssuesClient(gitHubClient); diff --git a/Octokit.Tests/Reactive/ObservableMilestonesClientTests.cs b/Octokit.Tests/Reactive/ObservableMilestonesClientTests.cs index 6208d369..62fd5721 100644 --- a/Octokit.Tests/Reactive/ObservableMilestonesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableMilestonesClientTests.cs @@ -76,11 +76,11 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(firstPageUrl, null, null) + gitHubClient.Connection.Get>(firstPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableMilestonesClient(gitHubClient); @@ -129,15 +129,15 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 3 && d["direction"] == "desc" && d["state"] == "open" && d["sort"] == "due_date"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservableMilestonesClient(gitHubClient); diff --git a/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs b/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs index 5da9fe03..2a9bd9ca 100644 --- a/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs @@ -23,7 +23,7 @@ namespace Octokit.Tests.Reactive client.GetAll("org"); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("orgs/org/members", UriKind.Relative), null, null); } @@ -47,7 +47,7 @@ namespace Octokit.Tests.Reactive client.GetPublic("org"); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("orgs/org/public_members", UriKind.Relative), null, null); } diff --git a/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs b/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs index e0ae04e7..c38a964d 100644 --- a/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs @@ -76,11 +76,11 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(firstPageUrl, null, null) + gitHubClient.Connection.Get>(firstPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservablePullRequestsClient(gitHubClient); @@ -129,15 +129,15 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(Arg.Is(firstPageUrl), + gitHubClient.Connection.Get>(Arg.Is(firstPageUrl), Arg.Is>(d => d.Count == 3 && d["head"] == "user:ref-name" && d["state"] == "open" && d["base"] == "fake_base_branch"), Arg.Any()) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl, null, null) + gitHubClient.Connection.Get>(secondPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl, null, null) + gitHubClient.Connection.Get>(thirdPageUrl, null, null) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var client = new ObservablePullRequestsClient(gitHubClient); @@ -285,7 +285,7 @@ namespace Octokit.Tests.Reactive client.Commits("fake", "repo", 42); - connection.Received().GetAsync>(new Uri(expectedUrl, UriKind.Relative), null, null); + connection.Received().Get>(new Uri(expectedUrl, UriKind.Relative), null, null); } [Fact] diff --git a/Octokit.Tests/Reactive/ObservableReleasesClientTests.cs b/Octokit.Tests/Reactive/ObservableReleasesClientTests.cs index de28b698..85fee58b 100644 --- a/Octokit.Tests/Reactive/ObservableReleasesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableReleasesClientTests.cs @@ -31,7 +31,7 @@ namespace Octokit.Tests.Reactive client.GetAll("fake", "repo"); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("repos/fake/repo/releases", UriKind.Relative), null, null); } @@ -160,7 +160,7 @@ namespace Octokit.Tests.Reactive client.GetAssets("fake", "repo", 1); - gitHubClient.Connection.Received(1).GetAsync>( + gitHubClient.Connection.Received(1).Get>( new Uri("repos/fake/repo/releases/1/assets", UriKind.Relative), null, null); } @@ -267,7 +267,7 @@ namespace Octokit.Tests.Reactive client.DeleteAsset("fake", "repo", 1); - gitHubClient.Connection.DeleteAsync( + gitHubClient.Connection.Delete( new Uri("repos/fake/repo/releases/assets/1", UriKind.Relative)); } diff --git a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs index 4161cd89..02e69a4a 100644 --- a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs @@ -22,18 +22,18 @@ namespace Octokit.Tests.Reactive var response = Task.Factory.StartNew>(() => new ApiResponse { BodyAsObject = repository }); var connection = Substitute.For(); - connection.GetAsync(Args.Uri, null, null).Returns(response); + connection.Get(Args.Uri, null, null).Returns(response); var gitHubClient = new GitHubClient(connection); var client = new ObservableRepositoriesClient(gitHubClient); var observable = client.Get("stark", "ned"); - connection.Received(1).GetAsync(Args.Uri, null, null); + connection.Received(1).Get(Args.Uri, null, null); var result = await observable; - connection.Received(1).GetAsync(Args.Uri, null, null); + connection.Received(1).Get(Args.Uri, null, null); var result2 = await observable; // TODO: If we change this to a warm observable, we'll need to change this to Received(2) - connection.Received(1).GetAsync(Args.Uri, null, null); + connection.Received(1).Get(Args.Uri, null, null); Assert.Same(repository, result); Assert.Same(repository, result2); @@ -90,9 +90,9 @@ namespace Octokit.Tests.Reactive var results = await repositoriesClient.GetAllForCurrent().ToArray(); Assert.Equal(7, results.Length); - gitHubClient.Connection.Received(1).GetAsync>(firstPageUrl, null, null); - gitHubClient.Connection.Received(1).GetAsync>(secondPageUrl, null, null); - gitHubClient.Connection.Received(1).GetAsync>(thirdPageUrl, null, null); + gitHubClient.Connection.Received(1).Get>(firstPageUrl, null, null); + gitHubClient.Connection.Received(1).Get>(secondPageUrl, null, null); + gitHubClient.Connection.Received(1).Get>(thirdPageUrl, null, null); } [Fact] @@ -155,10 +155,10 @@ namespace Octokit.Tests.Reactive var results = await repositoriesClient.GetAllForCurrent().Take(4).ToArray(); Assert.Equal(4, results.Length); - gitHubClient.Connection.Received(1).GetAsync>(firstPageUrl, null, null); - gitHubClient.Connection.Received(1).GetAsync>(secondPageUrl, null, null); - gitHubClient.Connection.Received(0).GetAsync>(thirdPageUrl, null, null); - gitHubClient.Connection.Received(0).GetAsync>(fourthPageUrl, null, null); + gitHubClient.Connection.Received(1).Get>(firstPageUrl, null, null); + gitHubClient.Connection.Received(1).Get>(secondPageUrl, null, null); + gitHubClient.Connection.Received(0).Get>(thirdPageUrl, null, null); + gitHubClient.Connection.Received(0).Get>(fourthPageUrl, null, null); } } @@ -211,7 +211,7 @@ namespace Octokit.Tests.Reactive client.GetAllContributors("owner", "repo"); github.Connection.Received(1) - .GetAsync>(expected, + .Get>(expected, Arg.Any>(), Arg.Any()); } diff --git a/Octokit.Tests/Reactive/ObservableStarredClientTests.cs b/Octokit.Tests/Reactive/ObservableStarredClientTests.cs index f8797c2f..8e6f38c0 100644 --- a/Octokit.Tests/Reactive/ObservableStarredClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableStarredClientTests.cs @@ -35,7 +35,7 @@ namespace Octokit.Tests.Reactive var client = new ObservableStarredClient(gitHubClient); client.GetAllStargazers("jugglingnutcase", "katiejamie"); - connection.Received().GetAsync>(ApiUrls.Stargazers("jugglingnutcase", "katiejamie"), null, null); + connection.Received().Get>(ApiUrls.Stargazers("jugglingnutcase", "katiejamie"), null, null); } } @@ -50,7 +50,7 @@ namespace Octokit.Tests.Reactive var client = new ObservableStarredClient(gitHubClient); client.GetAllForCurrent(); - connection.Received().GetAsync>(ApiUrls.Starred(), null, null); + connection.Received().Get>(ApiUrls.Starred(), null, null); } } @@ -73,7 +73,7 @@ namespace Octokit.Tests.Reactive var client = new ObservableStarredClient(gitHubClient); client.GetAllForUser("jugglingnutcase"); - connection.Received().GetAsync>(ApiUrls.StarredByUser("jugglingnutcase"), null, null); + connection.Received().Get>(ApiUrls.StarredByUser("jugglingnutcase"), null, null); } }