diff --git a/Octokit.Tests/Http/ApiConnectionTests.cs b/Octokit.Tests/Http/ApiConnectionTests.cs index 77ed62c2..a6e186b8 100644 --- a/Octokit.Tests/Http/ApiConnectionTests.cs +++ b/Octokit.Tests/Http/ApiConnectionTests.cs @@ -27,7 +27,7 @@ namespace Octokit.Tests.Http var data = await apiConnection.Get(getUri); Assert.Same(response.BodyAsObject, data); - connection.Received().GetAsync(getUri); + connection.Received().GetResponse(getUri); } [Fact] @@ -314,12 +314,12 @@ namespace Octokit.Tests.Http const HttpStatusCode statusCode = HttpStatusCode.OK; IResponse response = new ApiResponse { BodyAsObject = new object(), StatusCode = statusCode }; var connection = Substitute.For(); - connection.GetAsync(queuedOperationUrl,Args.CancellationToken).Returns(Task.FromResult(response)); + connection.GetResponse(queuedOperationUrl,Args.CancellationToken).Returns(Task.FromResult(response)); var apiConnection = new ApiConnection(connection); await apiConnection.GetQueuedOperation(queuedOperationUrl,CancellationToken.None); - connection.Received().GetAsync(queuedOperationUrl, Args.CancellationToken); + connection.Received().GetResponse(queuedOperationUrl, Args.CancellationToken); } [Fact] @@ -330,7 +330,7 @@ namespace Octokit.Tests.Http const HttpStatusCode statusCode = HttpStatusCode.PartialContent; IResponse response = new ApiResponse { BodyAsObject = new object(), StatusCode = statusCode }; var connection = Substitute.For(); - connection.GetAsync(queuedOperationUrl, Args.CancellationToken).Returns(Task.FromResult(response)); + connection.GetResponse(queuedOperationUrl, Args.CancellationToken).Returns(Task.FromResult(response)); var apiConnection = new ApiConnection(connection); await AssertEx.Throws(async () => await apiConnection.GetQueuedOperation(queuedOperationUrl, Args.CancellationToken)); @@ -345,7 +345,7 @@ namespace Octokit.Tests.Http const HttpStatusCode statusCode = HttpStatusCode.OK; IResponse response = new ApiResponse { BodyAsObject = result, StatusCode = statusCode }; var connection = Substitute.For(); - connection.GetAsync(queuedOperationUrl, Args.CancellationToken).Returns(Task.FromResult(response)); + connection.GetResponse(queuedOperationUrl, Args.CancellationToken).Returns(Task.FromResult(response)); var apiConnection = new ApiConnection(connection); var actualResult = await apiConnection.GetQueuedOperation(queuedOperationUrl, Args.CancellationToken); @@ -361,7 +361,7 @@ namespace Octokit.Tests.Http IResponse firstResponse = new ApiResponse { BodyAsObject = result, StatusCode = HttpStatusCode.Accepted }; IResponse completedResponse = new ApiResponse { BodyAsObject = result, StatusCode = HttpStatusCode.OK }; var connection = Substitute.For(); - connection.GetAsync(queuedOperationUrl, Args.CancellationToken) + connection.GetResponse(queuedOperationUrl, Args.CancellationToken) .Returns(x => Task.FromResult(firstResponse), x => Task.FromResult(firstResponse), x => Task.FromResult(completedResponse)); @@ -370,7 +370,7 @@ namespace Octokit.Tests.Http await apiConnection.GetQueuedOperation(queuedOperationUrl, CancellationToken.None); - connection.Received(3).GetAsync(queuedOperationUrl, Args.CancellationToken); + connection.Received(3).GetResponse(queuedOperationUrl, Args.CancellationToken); } public async Task CanCancelQueuedOperation() @@ -380,7 +380,7 @@ namespace Octokit.Tests.Http var result = new object(); IResponse accepted = new ApiResponse { BodyAsObject = result, StatusCode = HttpStatusCode.Accepted }; var connection = Substitute.For(); - connection.GetAsync(queuedOperationUrl, Args.CancellationToken).Returns(x => Task.FromResult(accepted)); + connection.GetResponse(queuedOperationUrl, Args.CancellationToken).Returns(x => Task.FromResult(accepted)); var apiConnection = new ApiConnection(connection); diff --git a/Octokit.Tests/Http/ConnectionTests.cs b/Octokit.Tests/Http/ConnectionTests.cs index 5f700b41..04797305 100644 --- a/Octokit.Tests/Http/ConnectionTests.cs +++ b/Octokit.Tests/Http/ConnectionTests.cs @@ -32,7 +32,7 @@ namespace Octokit.Tests.Http httpClient, Substitute.For()); - await connection.GetAsync(new Uri("endpoint", UriKind.Relative)); + await connection.GetResponse(new Uri("endpoint", UriKind.Relative)); httpClient.Received(1).Send(Arg.Is(req => req.BaseAddress == ExampleUri && @@ -54,9 +54,9 @@ namespace Octokit.Tests.Http httpClient, Substitute.For()); - await connection.GetAsync(new Uri("endpoint", UriKind.Relative)); - await connection.GetAsync(new Uri("endpoint", UriKind.Relative)); - await connection.GetAsync(new Uri("endpoint", UriKind.Relative)); + await connection.GetResponse(new Uri("endpoint", UriKind.Relative)); + await connection.GetResponse(new Uri("endpoint", UriKind.Relative)); + await connection.GetResponse(new Uri("endpoint", UriKind.Relative)); httpClient.Received(3).Send(Arg.Is(req => req.BaseAddress == ExampleUri && @@ -83,7 +83,7 @@ namespace Octokit.Tests.Http httpClient, Substitute.For()); - var resp = await connection.GetAsync(new Uri("endpoint", UriKind.Relative)); + var resp = await connection.GetResponse(new Uri("endpoint", UriKind.Relative)); Assert.NotNull(resp.ApiInfo); Assert.Equal("user", resp.ApiInfo.AcceptedOauthScopes.First()); } @@ -101,7 +101,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.NotNull(exception); } @@ -125,7 +125,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal(HttpStatusCode.Unauthorized, exception.StatusCode); } @@ -155,7 +155,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal(expectedFactorType, exception.TwoFactorType); } @@ -178,7 +178,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal("Validation Failed", exception.Message); Assert.Equal("key is already in use", exception.ApiError.Errors[0].Message); @@ -202,7 +202,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal("API rate limit exceeded. See http://developer.github.com/v3/#rate-limiting for details.", exception.Message); @@ -226,7 +226,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal("Maximum number of login attempts exceeded", exception.Message); Assert.Equal("http://developer.github.com/v3", exception.ApiError.DocumentationUrl); @@ -249,7 +249,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal("GONE BYE BYE!", exception.Message); } @@ -271,7 +271,7 @@ namespace Octokit.Tests.Http Substitute.For()); var exception = await AssertEx.Throws( - async () => await connection.GetAsync(new Uri("endpoint", UriKind.Relative))); + async () => await connection.GetResponse(new Uri("endpoint", UriKind.Relative))); Assert.Equal("YOU SHALL NOT PASS!", exception.Message); } diff --git a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs index 9347be37..4161cd89 100644 --- a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs @@ -79,11 +79,11 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(firstPageUrl) + gitHubClient.Connection.GetResponse>(firstPageUrl) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl) + gitHubClient.Connection.GetResponse>(secondPageUrl) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl) + gitHubClient.Connection.GetResponse>(thirdPageUrl) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var repositoriesClient = new ObservableRepositoriesClient(gitHubClient); @@ -142,13 +142,13 @@ namespace Octokit.Tests.Reactive ApiInfo = CreateApiInfo(new Dictionary()) }; var gitHubClient = Substitute.For(); - gitHubClient.Connection.GetAsync>(firstPageUrl) + gitHubClient.Connection.GetResponse>(firstPageUrl) .Returns(Task.Factory.StartNew>>(() => firstPageResponse)); - gitHubClient.Connection.GetAsync>(secondPageUrl) + gitHubClient.Connection.GetResponse>(secondPageUrl) .Returns(Task.Factory.StartNew>>(() => secondPageResponse)); - gitHubClient.Connection.GetAsync>(thirdPageUrl) + gitHubClient.Connection.GetResponse>(thirdPageUrl) .Returns(Task.Factory.StartNew>>(() => thirdPageResponse)); - gitHubClient.Connection.GetAsync>(fourthPageUrl) + gitHubClient.Connection.GetResponse>(fourthPageUrl) .Returns(Task.Factory.StartNew>>(() => lastPageResponse)); var repositoriesClient = new ObservableRepositoriesClient(gitHubClient); @@ -184,7 +184,7 @@ namespace Octokit.Tests.Reactive client.GetAllBranches("owner", "repo"); - github.Connection.Received(1).GetAsync>(expected); + github.Connection.Received(1).GetResponse>(expected); } } @@ -241,7 +241,7 @@ namespace Octokit.Tests.Reactive client.GetAllLanguages("owner", "repo"); - github.Connection.Received(1).GetAsync>>(expected); + github.Connection.Received(1).GetResponse>>(expected); } } @@ -267,7 +267,7 @@ namespace Octokit.Tests.Reactive client.GetAllTeams("owner", "repo"); - github.Connection.Received(1).GetAsync>(expected); + github.Connection.Received(1).GetResponse>(expected); } } @@ -293,7 +293,7 @@ namespace Octokit.Tests.Reactive client.GetAllTags("owner", "repo"); - github.Connection.Received(1).GetAsync>(expected); + github.Connection.Received(1).GetResponse>(expected); } } diff --git a/Octokit.Tests/Reactive/ObservableUserEmailsClientTests.cs b/Octokit.Tests/Reactive/ObservableUserEmailsClientTests.cs index 49ea1e8f..1e62a86b 100644 --- a/Octokit.Tests/Reactive/ObservableUserEmailsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableUserEmailsClientTests.cs @@ -27,7 +27,7 @@ namespace Octokit.Tests client.GetAll(); - github.Connection.Received(1).GetAsync>(expectedUri); + github.Connection.Received(1).GetResponse>(expectedUri); } } diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs index 31fd88c3..8b7b9d93 100644 --- a/Octokit/Clients/TeamsClient.cs +++ b/Octokit/Clients/TeamsClient.cs @@ -120,7 +120,7 @@ namespace Octokit try { - var response = await ApiConnection.Connection.GetAsync(endpoint); + var response = await ApiConnection.Connection.GetResponse(endpoint); return response.StatusCode == System.Net.HttpStatusCode.NoContent; } catch (NotFoundException) diff --git a/Octokit/Helpers/ApiExtensions.cs b/Octokit/Helpers/ApiExtensions.cs index 9da6076b..4890bbae 100644 --- a/Octokit/Helpers/ApiExtensions.cs +++ b/Octokit/Helpers/ApiExtensions.cs @@ -41,7 +41,7 @@ namespace Octokit return connection.GetHtml(uri, null); } - public static Task> GetAsync(this IConnection connection, Uri uri) + public static Task> GetResponse(this IConnection connection, Uri uri) { Ensure.ArgumentNotNull(connection, "connection"); Ensure.ArgumentNotNull(uri, "uri"); @@ -49,7 +49,7 @@ namespace Octokit return connection.Get(uri, null, null); } - public static Task> GetAsync(this IConnection connection, Uri uri, CancellationToken cancellationToken) + public static Task> GetResponse(this IConnection connection, Uri uri, CancellationToken cancellationToken) { Ensure.ArgumentNotNull(connection, "connection"); Ensure.ArgumentNotNull(uri, "uri"); diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs index 80251738..9caaad59 100644 --- a/Octokit/Http/ApiConnection.cs +++ b/Octokit/Http/ApiConnection.cs @@ -301,7 +301,7 @@ namespace Octokit { Ensure.ArgumentNotNull(uri, "uri"); - var response = await Connection.GetAsync(uri, cancellationToken); + var response = await Connection.GetResponse(uri, cancellationToken); if (response.StatusCode == HttpStatusCode.Accepted) {