From fbfc3fcd2c6cb91765cd6088fefd43802b35951f Mon Sep 17 00:00:00 2001 From: Haacked Date: Thu, 1 Jan 2015 21:12:24 -0800 Subject: [PATCH] Remove empty ApiInfo constructor --- Octokit.Tests/Clients/AssigneesClientTests.cs | 2 +- Octokit.Tests/Clients/FollowersClientTests.cs | 12 ++++++------ Octokit.Tests/Clients/GistsClientTests.cs | 6 ++---- .../Clients/OrganizationMembersClientTests.cs | 12 ++++++------ .../Clients/RepoCollaboratorsClientTests.cs | 5 ++--- Octokit.Tests/Clients/StarredClientTests.cs | 4 ++-- Octokit/Http/ApiResponse.cs | 9 ++------- 7 files changed, 21 insertions(+), 29 deletions(-) diff --git a/Octokit.Tests/Clients/AssigneesClientTests.cs b/Octokit.Tests/Clients/AssigneesClientTests.cs index 30e7fb75..14786ee6 100644 --- a/Octokit.Tests/Clients/AssigneesClientTests.cs +++ b/Octokit.Tests/Clients/AssigneesClientTests.cs @@ -60,7 +60,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "repos/foo/bar/assignees/cody"), null, null).Returns(response); diff --git a/Octokit.Tests/Clients/FollowersClientTests.cs b/Octokit.Tests/Clients/FollowersClientTests.cs index 95a28846..ccea7986 100644 --- a/Octokit.Tests/Clients/FollowersClientTests.cs +++ b/Octokit.Tests/Clients/FollowersClientTests.cs @@ -112,7 +112,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), null, null).Returns(response); @@ -129,7 +129,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), null, null).Returns(response); @@ -159,7 +159,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), null, null).Returns(response); @@ -176,7 +176,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"), null, null).Returns(response); @@ -208,7 +208,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Put(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), Args.Object).Returns(response); @@ -225,7 +225,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Put(Arg.Is(u => u.ToString() == "user/following/alfhenrik"), new { }).Returns(response); diff --git a/Octokit.Tests/Clients/GistsClientTests.cs b/Octokit.Tests/Clients/GistsClientTests.cs index 6dca943c..c73b93d2 100644 --- a/Octokit.Tests/Clients/GistsClientTests.cs +++ b/Octokit.Tests/Clients/GistsClientTests.cs @@ -4,11 +4,9 @@ using Octokit.Internal; using Octokit.Tests.Helpers; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Net; using System.Threading.Tasks; using Xunit; -using Xunit.Extensions; public class GistsClientTests { @@ -197,7 +195,7 @@ public class GistsClientTests public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "gists/1/star"), null, null).Returns(response); @@ -214,7 +212,7 @@ public class GistsClientTests public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "gists/1/star"), null, null).Returns(response); diff --git a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs index 661a5f84..bb1acc4a 100644 --- a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs +++ b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs @@ -100,7 +100,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "orgs/org/members/username"), null, null).Returns(response); @@ -117,7 +117,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "orgs/org/members/username"), null, null).Returns(response); @@ -148,7 +148,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "orgs/org/public_members/username"), null, null).Returns(response); @@ -165,7 +165,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "orgs/org/public_members/username"), null, null).Returns(response); @@ -220,7 +220,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Put(Arg.Is(u => u.ToString() == "orgs/org/public_members/username"), Args.Object).Returns(response); @@ -237,7 +237,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Put(Arg.Is(u => u.ToString() == "orgs/org/public_members/username"), new { }).Returns(response); diff --git a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs index 9616673f..1faeaabd 100644 --- a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs +++ b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs @@ -4,7 +4,6 @@ using NSubstitute; using Octokit.Tests.Helpers; using Xunit; using System.Net; -using Xunit.Extensions; using Octokit.Internal; namespace Octokit.Tests.Clients @@ -56,7 +55,7 @@ namespace Octokit.Tests.Clients public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "repos/owner/test/collaborators/user1"), null, null).Returns(response); @@ -73,7 +72,7 @@ namespace Octokit.Tests.Clients public async Task ThrowsExceptionForInvalidStatusCode() { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = HttpStatusCode.Conflict }); + new ApiResponse(new Response { StatusCode = HttpStatusCode.Conflict })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "repos/foo/bar/assignees/cody"), null, null).Returns(response); diff --git a/Octokit.Tests/Clients/StarredClientTests.cs b/Octokit.Tests/Clients/StarredClientTests.cs index 5a714737..512bdec5 100644 --- a/Octokit.Tests/Clients/StarredClientTests.cs +++ b/Octokit.Tests/Clients/StarredClientTests.cs @@ -63,7 +63,7 @@ namespace Octokit.Tests.Clients public async Task ReturnsCorrectResultBasedOnStatus(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Get(Arg.Is(u => u.ToString() == "user/starred/yes/no"), null, null) .Returns(response); @@ -86,7 +86,7 @@ namespace Octokit.Tests.Clients public async Task ReturnsCorrectResultBasedOnStatus(HttpStatusCode status, bool expected) { var response = Task.Factory.StartNew>(() => - new ApiResponse { StatusCode = status }); + new ApiResponse(new Response { StatusCode = status })); var connection = Substitute.For(); connection.Put(Arg.Is(u => u.ToString() == "user/starred/yes/no"), diff --git a/Octokit/Http/ApiResponse.cs b/Octokit/Http/ApiResponse.cs index a83ba12b..a71198d6 100644 --- a/Octokit/Http/ApiResponse.cs +++ b/Octokit/Http/ApiResponse.cs @@ -6,11 +6,6 @@ namespace Octokit.Internal { public class ApiResponse : IApiResponse { - public ApiResponse() - { - Headers = new Dictionary(); - } - public ApiResponse(IResponse response) : this(response, GetBodyAsObject(response)) { } @@ -40,9 +35,9 @@ namespace Octokit.Internal static T GetBodyAsObject(IResponse response) { - if (response == null) return default(T); var body = response.Body; - return body is T ? (T)body : default(T); + if (body is T) return (T)body; + return default(T); } } }