remove all usages of TaskFactory in test suite (#2164)

octokit · Mar 31, 2020 · 4b0e725 · 4b0e725
1 parent b540913
commit 4b0e725
Show file tree

Hide file tree

Showing 18 changed files with 219 additions and 179 deletions.
diff --git a/Octokit.Tests/Clients/AssigneesClientTests.cs b/Octokit.Tests/Clients/AssigneesClientTests.cs
@@ -114,11 +114,10 @@ public class TheCheckAssigneeMethod
             [InlineData(HttpStatusCode.NotFound, false)]
             public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected)
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+                var responseTask = TestSetup.GetApiResponse(status);
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repos/foo/bar/assignees/cody"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new AssigneesClient(apiConnection);
@@ -133,11 +132,12 @@ public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool
             [InlineData(HttpStatusCode.NotFound, false)]
             public async Task RequestsCorrectValueForStatusCodeWithRepositoryId(HttpStatusCode status, bool expected)
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+                var responseTask = TestSetup.GetApiResponse(status);
+
                 var connection = Substitute.For<IConnection>();
-                connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/assignees/cody"),
-                    null, null).Returns(response);
+                connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/assignees/cody"), null, null)
+                          .Returns(responseTask);
+
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new AssigneesClient(apiConnection);
@@ -150,11 +150,12 @@ public async Task RequestsCorrectValueForStatusCodeWithRepositoryId(HttpStatusCo
             [Fact]
             public async Task ThrowsExceptionForInvalidStatusCode()
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+                var responseTask = TestSetup.GetApiResponse(HttpStatusCode.Conflict);
+
                 var connection = Substitute.For<IConnection>();
-                connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repos/foo/bar/assignees/cody"),
-                    null, null).Returns(response);
+                connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repos/foo/bar/assignees/cody"), null, null)
+                          .Returns(responseTask);
+
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new AssigneesClient(apiConnection);
@@ -165,11 +166,11 @@ public async Task ThrowsExceptionForInvalidStatusCode()
             [Fact]
             public async Task ThrowsExceptionForInvalidStatusCodeWithRepositoryId()
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/assignees/cody"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new AssigneesClient(apiConnection);

diff --git a/Octokit.Tests/Clients/AuthorizationsClientTests.cs b/Octokit.Tests/Clients/AuthorizationsClientTests.cs
@@ -173,12 +173,12 @@ public async Task UsesCallbackToRetrieveTwoFactorCode()
                     "secret",
                     Arg.Any<NewAuthorization>(),
                     "two-factor-code")
-                    .Returns(Task.Factory.StartNew(() => new ApplicationAuthorization(0, null, null, null, null, null, null, null, DateTimeOffset.Now, DateTimeOffset.Now, null, "xyz")));
+                    .Returns(Task.FromResult(new ApplicationAuthorization(0, null, null, null, null, null, null, null, DateTimeOffset.Now, DateTimeOffset.Now, null, "xyz")));
 
                 var result = await client.GetOrCreateApplicationAuthentication("clientId",
                     "secret",
                     data,
-                    e => Task.Factory.StartNew(() => twoFactorChallengeResult));
+                    e => Task.FromResult(twoFactorChallengeResult));
 
                 client.Received().GetOrCreateApplicationAuthentication("clientId",
                     "secret",
@@ -205,12 +205,12 @@ public async Task RetriesWhenResendRequested()
                     "secret",
                     Arg.Any<NewAuthorization>(),
                     "two-factor-code")
-                    .Returns(Task.Factory.StartNew(() => new ApplicationAuthorization(0, null, null, null, null, null, null, null, DateTimeOffset.Now, DateTimeOffset.Now, null, "OAUTHSECRET")));
+                    .Returns(Task.FromResult(new ApplicationAuthorization(0, null, null, null, null, null, null, null, DateTimeOffset.Now, DateTimeOffset.Now, null, "OAUTHSECRET")));
 
                 var result = await client.GetOrCreateApplicationAuthentication("clientId",
                     "secret",
                     data,
-                    e => Task.Factory.StartNew(() => challengeResults.Dequeue()));
+                    e => Task.FromResult(challengeResults.Dequeue()));
 
                 client.Received(2).GetOrCreateApplicationAuthentication("clientId",
                     "secret",
@@ -245,7 +245,7 @@ public async Task ThrowsTwoFactorChallengeFailedExceptionWhenProvidedCodeIsIncor
                         "clientId",
                         "secret",
                         data,
-                        e => Task.Factory.StartNew(() => challengeResults.Dequeue())));
+                        e => Task.FromResult(challengeResults.Dequeue())));
 
                 Assert.NotNull(exception);
                 client.Received().GetOrCreateApplicationAuthentication("clientId",

diff --git a/Octokit.Tests/Clients/FollowersClientTests.cs b/Octokit.Tests/Clients/FollowersClientTests.cs
@@ -9,7 +9,7 @@
 namespace Octokit.Tests.Clients
 {
     /// <summary>
-    /// Client tests mostly just need to make sure they call the IApiConnection with the correct 
+    /// Client tests mostly just need to make sure they call the IApiConnection with the correct
     /// relative Uri. No need to fake up the response. All *those* tests are in ApiConnectionTests.cs.
     /// </summary>
     public class FollowersClientTests
@@ -204,11 +204,11 @@ public class TheIsFollowingForCurrentMethod
             [InlineData(HttpStatusCode.NotFound, false)]
             public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected)
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(status, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);
@@ -221,11 +221,11 @@ public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool
             [Fact]
             public async Task ThrowsExceptionForInvalidStatusCode()
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);
@@ -251,11 +251,11 @@ public class TheIsFollowingMethod
             [InlineData(HttpStatusCode.NotFound, false)]
             public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected)
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(status, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);
@@ -268,11 +268,11 @@ public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool
             [Fact]
             public async Task ThrowsExceptionForInvalidStatusCode()
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
                 var connection = Substitute.For<IConnection>();
                 connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "users/alfhenrik/following/alfhenrik-test"),
-                    null, null).Returns(response);
+                    null, null).Returns(responseTask);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);
@@ -299,11 +299,13 @@ public class TheFollowMethod
             [InlineData(HttpStatusCode.NoContent, true)]
             public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected)
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(status, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
+
                 var connection = Substitute.For<IConnection>();
-                connection.Put<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"),
-                    Args.Object).Returns(response);
+                connection.Put<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"), Args.Object)
+                          .Returns(responseTask);
+
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);
@@ -316,11 +318,13 @@ public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool
             [Fact]
             public async Task ThrowsExceptionForInvalidStatusCode()
             {
-                var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                    new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+                var response = new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json");
+                var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
+
                 var connection = Substitute.For<IConnection>();
-                connection.Put<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"),
-                    new { }).Returns(response);
+                connection.Put<object>(Arg.Is<Uri>(u => u.ToString() == "user/following/alfhenrik"), Args.Object)
+                          .Returns(responseTask);
+
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
                 var client = new FollowersClient(apiConnection);

diff --git a/Octokit.Tests/Clients/GistsClientTests.cs b/Octokit.Tests/Clients/GistsClientTests.cs
@@ -499,11 +499,13 @@ public void RequestsCorrectUnstarUrl()
         [InlineData(HttpStatusCode.NotFound, false)]
         public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool expected)
         {
-            var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                new ApiResponse<object>(new Response(status, null, new Dictionary<string, string>(), "application/json")));
+            var response = new Response(status, null, new Dictionary<string, string>(), "application/json");
+            var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
+
             var connection = Substitute.For<IConnection>();
-            connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "gists/1/star"),
-                null, null).Returns(response);
+            connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "gists/1/star"), null, null)
+                      .Returns(responseTask);
+
             var apiConnection = Substitute.For<IApiConnection>();
             apiConnection.Connection.Returns(connection);
             var client = new GistsClient(apiConnection);
@@ -516,11 +518,13 @@ public async Task RequestsCorrectValueForStatusCode(HttpStatusCode status, bool
         [Fact]
         public async Task ThrowsExceptionForInvalidStatusCode()
         {
-            var response = Task.Factory.StartNew<IApiResponse<object>>(() =>
-                new ApiResponse<object>(new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json")));
+            var response = new Response(HttpStatusCode.Conflict, null, new Dictionary<string, string>(), "application/json");
+            var responseTask = Task.FromResult<IApiResponse<object>>(new ApiResponse<object>(response));
+
             var connection = Substitute.For<IConnection>();
-            connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "gists/1/star"),
-                null, null).Returns(response);
+            connection.Get<object>(Arg.Is<Uri>(u => u.ToString() == "gists/1/star"), null, null)
+                      .Returns(responseTask);
+
             var apiConnection = Substitute.For<IApiConnection>();
             apiConnection.Connection.Returns(connection);
 
@@ -568,4 +572,4 @@ public void PostsToTheCorrectUrl()
             connection.Received().Patch<Gist>(Arg.Is<Uri>(u => u.ToString() == "gists/1"), Arg.Any<object>());
         }
     }
-}
+}