Clean up AggregateAsync tests.

Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/Aggregate.cs

@@ -13,10 +13,8 @@ namespace Tests
     public class Aggregate : AsyncEnumerableTests
     {
         [Fact]
-        public async Task Aggregate_Null()
+        public async Task AggregateAsync_Sync_Null()
         {
-            // T
-
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int>(default, (x, y) => x + y).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync(Return42, default(Func<int, int, int>)).AsTask());
 
@@ -36,9 +34,11 @@ namespace Tests
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int, int, int>(default, 0, (x, y) => x + y, z => z, CancellationToken.None).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync(Return42, 0, default, z => z, CancellationToken.None).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int, int, int>(Return42, 0, (x, y) => x + y, default, CancellationToken.None).AsTask());
+        }
 
-            // ValueTask<T>
-
+        [Fact]
+        public async Task AggregateAsync_Async_Null()
+        {
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int>(default, (x, y) => new ValueTask<int>(x + y)).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync(Return42, default(Func<int, int, ValueTask<int>>)).AsTask());
 
@@ -58,10 +58,12 @@ namespace Tests
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int, int, int>(default, 0, (x, y) => new ValueTask<int>(x + y), z => new ValueTask<int>(z), CancellationToken.None).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync(Return42, 0, default(Func<int, int, ValueTask<int>>), z => new ValueTask<int>(z), CancellationToken.None).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int, int, int>(Return42, 0, (x, y) => new ValueTask<int>(x + y), default, CancellationToken.None).AsTask());
+        }
 
 #if !NO_DEEP_CANCELLATION
-            // CancellationToken, ValueTask<T>
-
+        [Fact]
+        public async Task AggregateAsync_AsyncCancel_Null()
+        {
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync<int>(default, (x, y, ct) => new ValueTask<int>(x + y)).AsTask());
             await Assert.ThrowsAsync<ArgumentNullException>(() => AsyncEnumerable.AggregateAsync(Return42, default(Func<int, int, CancellationToken, ValueTask<int>>)).AsTask());
 
@@ -308,7 +310,7 @@ namespace Tests
 
 #if !NO_DEEP_CANCELLATION
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Simple()
+        public async Task AggregateAsync_AsyncCancel_Simple()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.AggregateAsync((x, y, ct) => new ValueTask<int>(x * y));
@@ -316,7 +318,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Empty()
+        public async Task AggregateAsync_AsyncCancel_Empty()
         {
             var xs = new int[0].ToAsyncEnumerable();
             var ys = xs.AggregateAsync((x, y, ct) => new ValueTask<int>(x * y));
@@ -324,7 +326,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Throw_Source()
+        public async Task AggregateAsync_AsyncCancel_Throw_Source()
         {
             var ex = new Exception("Bang!");
             var xs = Throw<int>(ex);
@@ -333,7 +335,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Throw_Selector()
+        public async Task AggregateAsync_AsyncCancel_Throw_Selector()
         {
             var ex = new Exception("Bang!");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -342,7 +344,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Simple()
+        public async Task AggregateAsync_AsyncCancel_Seed_Simple()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.AggregateAsync(1, (x, y, ct) => new ValueTask<int>(x * y));
@@ -350,7 +352,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Emtpy()
+        public async Task AggregateAsync_AsyncCancel_Seed_Emtpy()
         {
             var xs = new int[0].ToAsyncEnumerable();
             var ys = xs.AggregateAsync(1, (x, y, ct) => new ValueTask<int>(x * y));
@@ -358,7 +360,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Throw_Source()
+        public async Task AggregateAsync_AsyncCancel_Seed_Throw_Source()
         {
             var ex = new Exception("Bang!");
             var xs = Throw<int>(ex);
@@ -367,7 +369,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Throw_Selector()
+        public async Task AggregateAsync_AsyncCancel_Seed_Throw_Selector()
         {
             var ex = new Exception("Bang!");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -376,7 +378,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Result_Simple()
+        public async Task AggregateAsync_AsyncCancel_Seed_Result_Simple()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.AggregateAsync(1, (x, y, ct) => new ValueTask<int>(x * y), (x, ct) => new ValueTask<int>(x + 1));
@@ -384,7 +386,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Result_Empty()
+        public async Task AggregateAsync_AsyncCancel_Seed_Result_Empty()
         {
             var xs = new int[0].ToAsyncEnumerable();
             var ys = xs.AggregateAsync(1, (x, y, ct) => new ValueTask<int>(x * y), (x, ct) => new ValueTask<int>(x + 1));
@@ -392,7 +394,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Result_Throw_Source()
+        public async Task AggregateAsync_AsyncCancel_Seed_Result_Throw_Source()
         {
             var ex = new Exception("Bang!");
             var xs = Throw<int>(ex);
@@ -401,7 +403,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Result_Throw_Selector()
+        public async Task AggregateAsync_AsyncCancel_Seed_Result_Throw_Selector()
         {
             var ex = new Exception("Bang!");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -410,7 +412,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task AggregateAsyncCancel_AsyncCancel_Seed_Result_Throw_ResultSelector()
+        public async Task AggregateAsync_AsyncCancel_Seed_Result_Throw_ResultSelector()
         {
             var ex = new Exception("Bang!");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();