Clean Up Tests To C#8, Removed Unsed, Get Passing

Author: say25

src/PostgreSQLCopyHelper.Test/Issues/Issue58_CancelRequest_Test.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Npgsql;
@@ -34,11 +32,11 @@ public Task Test_CanceledBulkInsertThrowsWhenCanceledBeforeStarting()
                      .MapInteger("Id", x => x.Id)
                      .MapText("Name", x => x.Name);
 
-            using (var cts = new CancellationTokenSource(1))
+            Assert.ThrowsAsync<TaskCanceledException>(async () =>
             {
-                Assert.ThrowsAsync<TaskCanceledException>(async () =>
-                    await subject.SaveAllAsync(connection, FetchUserData(5), cts.Token), $"Should Throw Exception of Type {nameof(TaskCanceledException)}!");
-            }
+                using var cancellationTokenSource = new CancellationTokenSource(1);
+                await subject.SaveAllAsync(connection, FetchUserData(5), cancellationTokenSource.Token);
+            }, $"Should Throw Exception of Type {nameof(TaskCanceledException)}!");
 
             return Task.CompletedTask;
         }
@@ -50,11 +48,11 @@ public Task Test_CanceledBulkInsertThrowsWhenCanceled()
                      .MapInteger("Id", x => x.Id)
                      .MapText("Name", x => x.Name);
 
-            using (var cts = new CancellationTokenSource(15))
+            Assert.ThrowsAsync<TaskCanceledException>(async () =>
             {
-                Assert.ThrowsAsync<TaskCanceledException>(async () =>
-                    await subject.SaveAllAsync(connection, FetchUserData(10), cts.Token), $"Should Throw Exception of Type {nameof(TaskCanceledException)}!");
-            }
+                using var cancellationTokenSource = new CancellationTokenSource(15);
+                await subject.SaveAllAsync(connection, FetchUserData(10), cancellationTokenSource.Token);
+            }, $"Should Throw Exception of Type {nameof(TaskCanceledException)}!");
 
             return Task.CompletedTask;
         }
@@ -66,26 +64,39 @@ public async Task Test_CanceledBulkInsertDoesNotThrowWhenCancelledAfterCompletio
                      .MapInteger("Id", x => x.Id)
                      .MapText("Name", x => x.Name);
 
-            using (var cts = new CancellationTokenSource(50))
+            var users = new List<User>();
+
+            await foreach (var user in FetchUserData(0))
             {
-                var recordsSaved = await subject.SaveAllAsync(connection, FetchUserData(10), cts.Token);
-                var result = connection.GetAll("sample", "\"TestUsers\"")
-                    .Cast<User>()
-                    .OrderBy(x => x.Id)
-                    .ToList();
-
-                Assert.AreEqual(2, recordsSaved);
-                Assert.AreEqual(1, result.First().Id);
-                Assert.AreEqual(2, result.Last().Id);
+                users.Add(user);
             }
+
+            using var cancellationTokenSource = new CancellationTokenSource(100);
+            var recordsSaved = await subject.SaveAllAsync(connection, FetchUserData(1), cancellationTokenSource.Token);
+
+            var result = connection.GetAll("sample", "TestUsers");
+
+            Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(2, recordsSaved);
+
+            Assert.IsNotNull(result[0][0]);
+            Assert.IsNotNull(result[1][0]);
+
+            Assert.AreEqual(users[0].Id, (int) result[0][0]);
+            Assert.AreEqual(users[0].Name, (string) result[0][1]);
+
+            Assert.AreEqual(users[1].Id, (int) result[1][0]);
+            Assert.AreEqual(users[1].Name, (string) result[1][1]);
+
+            Assert.AreEqual(2, recordsSaved);
         }
 
-        private static async IAsyncEnumerable<User> FetchUserData(int delayMillis, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        private static async IAsyncEnumerable<User> FetchUserData(int delayMillis)
         {
             for (var i = 1; i <= 2; i++)
             {
                 // Simulate waiting for data to come through.
-                await Task.Delay(delayMillis, cancellationToken);
+                await Task.Delay(delayMillis);
                 yield return new User
                 {
                     Id = i,

src/PostgreSQLCopyHelper.Test/PostgreSQLCopyHelper.Test.csproj

@@ -15,8 +15,4 @@
     <ProjectReference Include="..\PostgreSQLCopyHelper\PostgreSQLCopyHelper.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>