Clean up GroupBy tests.

bartdesmet · bartdesmet · commit de10e1351a7e · 2019-02-23T19:34:24.000-08:00
diff --git a/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/GroupBy.cs b/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/GroupBy.cs
@@ -49,7 +49,7 @@ public void GroupBy_Null()
         }
 
         [Fact]
-        public async Task GroupBy1()
+        public async Task GroupBy_KeySelector_Sync_Simple1()
         {
             var xs = new[] {
                 new { Name = "Bart", Age = 27 },
@@ -98,7 +98,7 @@ public async Task GroupBy1()
         }
 
         [Fact]
-        public async Task GroupBy2()
+        public async Task GroupBy_KeySelector_Sync_Simple2()
         {
             var xs = new[] {
                 new { Name = "Bart", Age = 27 },
@@ -155,7 +155,7 @@ public async Task GroupBy2()
         }
 
         [Fact]
-        public async Task GroupBy3()
+        public async Task GroupBy_KeySelector_Sync_Empty()
         {
             var xs = AsyncEnumerable.Empty<int>();
             var ys = xs.GroupBy(x => x);
@@ -165,7 +165,7 @@ public async Task GroupBy3()
         }
 
         [Fact]
-        public async Task GroupBy4Async()
+        public async Task GroupBy_KeySelector_Sync_Throws_Source1()
         {
             var ex = new Exception("Bang!");
             var xs = Throw<int>(ex);
@@ -176,19 +176,7 @@ public async Task GroupBy4Async()
         }
 
         [Fact]
-        public async Task GroupBy5Async()
-        {
-            var ex = new Exception("Bang!");
-            var xs = GetXs(ex).ToAsyncEnumerable();
-            var ys = xs.GroupBy(x => x);
-
-            var e = ys.GetAsyncEnumerator();
-
-            await AssertThrowsAsync(e.MoveNextAsync(), ex);
-        }
-
-        [Fact]
-        public async Task GroupBy6Async()
+        public async Task GroupBy_KeySelector_Sync_Throws_Source2()
         {
             var ex = new Exception("Bang!");
             var xs = GetXs(ex).ToAsyncEnumerable();
@@ -207,7 +195,7 @@ private static IEnumerable<int> GetXs(Exception ex)
         }
 
         [Fact]
-        public async Task GroupBy7Async()
+        public async Task GroupBy_KeySelector_Sync_Throws_KeySelector1()
         {
             var ex = new Exception("Bang!");
             var xs = Return42;
@@ -218,7 +206,7 @@ public async Task GroupBy7Async()
         }
 
         [Fact]
-        public async Task GroupBy8Async()
+        public async Task GroupBy_KeySelector_Sync_Throws_KeySelector2()
         {
             var ex = new Exception("Bang!");
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
@@ -230,7 +218,7 @@ public async Task GroupBy8Async()
         }
 
         [Fact]
-        public async Task GroupBy9()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Simple1()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -269,7 +257,7 @@ public async Task GroupBy9()
         }
 
         [Fact]
-        public async Task GroupBy10()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Simple1()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -282,7 +270,7 @@ public async Task GroupBy10()
         }
 
         [Fact]
-        public async Task GroupBy11()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Simple2()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -295,7 +283,7 @@ public async Task GroupBy11()
         }
 
         [Fact]
-        public async Task GroupBy12()
+        public async Task GroupBy_KeySelector_Sync_Comparer_Simple()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
@@ -334,7 +322,7 @@ public async Task GroupBy12()
         }
 
         [Fact]
-        public async Task GroupBy13()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple1()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));
@@ -373,33 +361,7 @@ public async Task GroupBy13()
         }
 
         [Fact]
-        public async Task GroupBy14()
-        {
-            var xs = AsyncEnumerable.Range(0, 10);
-            var ys = xs.GroupBy(x => x, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
-
-            var e = ys.GetAsyncEnumerator();
-            await HasNextAsync(e, "0 - adgj");
-            await HasNextAsync(e, "1 - beh");
-            await HasNextAsync(e, "2 - cfi");
-            await NoNextAsync(e);
-        }
-
-        [Fact]
-        public async Task GroupBy15()
-        {
-            var xs = AsyncEnumerable.Range(0, 10);
-            var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
-
-            var e = ys.GetAsyncEnumerator();
-            await HasNextAsync(e, "0 - 0369");
-            await HasNextAsync(e, "1 - 147");
-            await HasNextAsync(e, "2 - 258");
-            await NoNextAsync(e);
-        }
-
-        [Fact]
-        public async Task GroupBy16()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple2()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));
@@ -443,7 +405,33 @@ public async Task GroupBy16()
         }
 
         [Fact]
-        public async Task GroupBy17()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Comparer_Simple1()
+        {
+            var xs = AsyncEnumerable.Range(0, 10);
+            var ys = xs.GroupBy(x => x, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
+
+            var e = ys.GetAsyncEnumerator();
+            await HasNextAsync(e, "0 - adgj");
+            await HasNextAsync(e, "1 - beh");
+            await HasNextAsync(e, "2 - cfi");
+            await NoNextAsync(e);
+        }
+
+        [Fact]
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Comparer_Simple2()
+        {
+            var xs = AsyncEnumerable.Range(0, 10);
+            var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
+
+            var e = ys.GetAsyncEnumerator();
+            await HasNextAsync(e, "0 - 0369");
+            await HasNextAsync(e, "1 - 147");
+            await HasNextAsync(e, "2 - 258");
+            await NoNextAsync(e);
+        }
+
+        [Fact]
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_DisposeEarly()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));
@@ -455,7 +443,7 @@ public async Task GroupBy17()
         }
 
         [Fact]
-        public async Task GroupBy18()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));
@@ -480,7 +468,7 @@ public async Task GroupBy18()
         }
 
         [Fact]
-        public async Task GroupBy19()
+        public async Task GroupBy_KeySelector_Sync_SequenceIdentity()
         {
             // We're using Kvp here because the types will eval as equal for this test
             var xs = new[]
@@ -501,9 +489,8 @@ public async Task GroupBy19()
             await SequenceIdentity(res);
         }
 
-
         [Fact]
-        public async Task GroupBy20()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_ToArray()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -514,7 +501,7 @@ public async Task GroupBy20()
         }
 
         [Fact]
-        public async Task GroupBy21()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_ToList()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -525,7 +512,7 @@ public async Task GroupBy21()
         }
 
         [Fact]
-        public async Task GroupBy22()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -534,7 +521,7 @@ public async Task GroupBy22()
         }
 
         [Fact]
-        public async Task GroupBy23()
+        public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_SequenceIdentity()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);
@@ -543,7 +530,7 @@ public async Task GroupBy23()
         }
 
         [Fact]
-        public async Task GroupBy24()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_ToArray()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -572,7 +559,7 @@ public async Task GroupBy24()
         }
 
         [Fact]
-        public async Task GroupBy25()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_ToList()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -599,7 +586,7 @@ public async Task GroupBy25()
         }
 
         [Fact]
-        public async Task GroupBy26()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -622,7 +609,7 @@ public async Task GroupBy26()
         }
 
         [Fact]
-        public async Task GroupBy27()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -633,7 +620,7 @@ public async Task GroupBy27()
         }
 
         [Fact]
-        public async Task GroupBy28()
+        public async Task GroupBy_KeySelector_ElementSelector_Sync_SequenceIdentity()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));
@@ -642,7 +629,7 @@ public async Task GroupBy28()
         }
 
         [Fact]
-        public async Task GroupBy29()
+        public async Task GroupBy_KeySelector_Sync_Comparer_Group_ToList()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
@@ -669,12 +656,11 @@ public async Task GroupBy29()
         }
 
         [Fact]
-        public async Task GroupBy30()
+        public async Task GroupBy_KeySelector_Sync_Comparer_Group_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
 
-
             var gar = await ys.ToListAsync();
 
             Assert.Equal(3, gar.Count);
@@ -693,7 +679,7 @@ public async Task GroupBy30()
         }
 
         [Fact]
-        public async Task GroupBy31()
+        public async Task GroupBy_KeySelector_Sync_Comparer_Group_ToArray()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
@@ -722,7 +708,7 @@ public async Task GroupBy31()
         }
 
         [Fact]
-        public async Task GroupBy32()
+        public async Task GroupBy_KeySelector_Sync_Comparer_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
@@ -733,7 +719,7 @@ public async Task GroupBy32()
         }
 
         [Fact]
-        public async Task GroupBy33()
+        public async Task GroupBy_KeySelector_Sync_Comparer_SequenceIdentity()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, new EqMod(3));
@@ -742,7 +728,7 @@ public async Task GroupBy33()
         }
 
         [Fact]
-        public async Task GroupBy34()
+        public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_ToArray()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
@@ -753,7 +739,7 @@ public async Task GroupBy34()
         }
 
         [Fact]
-        public async Task GroupBy35()
+        public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_ToList()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
@@ -764,7 +750,7 @@ public async Task GroupBy35()
         }
 
         [Fact]
-        public async Task GroupBy36()
+        public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_Count()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));
@@ -773,7 +759,7 @@ public async Task GroupBy36()
         }
 
         [Fact]
-        public async Task GroupBy37()
+        public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_SequenceIdentity()
         {
             var xs = AsyncEnumerable.Range(0, 10);
             var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void GroupBy_Null()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`[Fact]`
`52`		`- public async Task GroupBy1()`
	`52`	`+ public async Task GroupBy_KeySelector_Sync_Simple1()`
`53`	`53`	`{`
`54`	`54`	`var xs = new[] {`
`55`	`55`	`new { Name = "Bart", Age = 27 },`
`@@ -98,7 +98,7 @@ public async Task GroupBy1()`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`[Fact]`
`101`		`- public async Task GroupBy2()`
	`101`	`+ public async Task GroupBy_KeySelector_Sync_Simple2()`
`102`	`102`	`{`
`103`	`103`	`var xs = new[] {`
`104`	`104`	`new { Name = "Bart", Age = 27 },`
`@@ -155,7 +155,7 @@ public async Task GroupBy2()`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`[Fact]`
`158`		`- public async Task GroupBy3()`
	`158`	`+ public async Task GroupBy_KeySelector_Sync_Empty()`
`159`	`159`	`{`
`160`	`160`	`var xs = AsyncEnumerable.Empty<int>();`
`161`	`161`	`var ys = xs.GroupBy(x => x);`
`@@ -165,7 +165,7 @@ public async Task GroupBy3()`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`[Fact]`
`168`		`- public async Task GroupBy4Async()`
	`168`	`+ public async Task GroupBy_KeySelector_Sync_Throws_Source1()`
`169`	`169`	`{`
`170`	`170`	`var ex = new Exception("Bang!");`
`171`	`171`	`var xs = Throw<int>(ex);`
`@@ -176,19 +176,7 @@ public async Task GroupBy4Async()`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`[Fact]`
`179`		`- public async Task GroupBy5Async()`
`180`		`- {`
`181`		`- var ex = new Exception("Bang!");`
`182`		`- var xs = GetXs(ex).ToAsyncEnumerable();`
`183`		`- var ys = xs.GroupBy(x => x);`
`184`		`-`
`185`		`- var e = ys.GetAsyncEnumerator();`
`186`		`-`
`187`		`- await AssertThrowsAsync(e.MoveNextAsync(), ex);`
`188`		`- }`
`189`		`-`
`190`		`- [Fact]`
`191`		`- public async Task GroupBy6Async()`
	`179`	`+ public async Task GroupBy_KeySelector_Sync_Throws_Source2()`
`192`	`180`	`{`
`193`	`181`	`var ex = new Exception("Bang!");`
`194`	`182`	`var xs = GetXs(ex).ToAsyncEnumerable();`
`@@ -207,7 +195,7 @@ private static IEnumerable<int> GetXs(Exception ex)`
`207`	`195`	`}`
`208`	`196`
`209`	`197`	`[Fact]`
`210`		`- public async Task GroupBy7Async()`
	`198`	`+ public async Task GroupBy_KeySelector_Sync_Throws_KeySelector1()`
`211`	`199`	`{`
`212`	`200`	`var ex = new Exception("Bang!");`
`213`	`201`	`var xs = Return42;`
`@@ -218,7 +206,7 @@ public async Task GroupBy7Async()`
`218`	`206`	`}`
`219`	`207`
`220`	`208`	`[Fact]`
`221`		`- public async Task GroupBy8Async()`
	`209`	`+ public async Task GroupBy_KeySelector_Sync_Throws_KeySelector2()`
`222`	`210`	`{`
`223`	`211`	`var ex = new Exception("Bang!");`
`224`	`212`	`var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();`
`@@ -230,7 +218,7 @@ public async Task GroupBy8Async()`
`230`	`218`	`}`
`231`	`219`
`232`	`220`	`[Fact]`
`233`		`- public async Task GroupBy9()`
	`221`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Simple1()`
`234`	`222`	`{`
`235`	`223`	`var xs = AsyncEnumerable.Range(0, 10);`
`236`	`224`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -269,7 +257,7 @@ public async Task GroupBy9()`
`269`	`257`	`}`
`270`	`258`
`271`	`259`	`[Fact]`
`272`		`- public async Task GroupBy10()`
	`260`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Simple1()`
`273`	`261`	`{`
`274`	`262`	`var xs = AsyncEnumerable.Range(0, 10);`
`275`	`263`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -282,7 +270,7 @@ public async Task GroupBy10()`
`282`	`270`	`}`
`283`	`271`
`284`	`272`	`[Fact]`
`285`		`- public async Task GroupBy11()`
	`273`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Simple2()`
`286`	`274`	`{`
`287`	`275`	`var xs = AsyncEnumerable.Range(0, 10);`
`288`	`276`	`var ys = xs.GroupBy(x => x % 3, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -295,7 +283,7 @@ public async Task GroupBy11()`
`295`	`283`	`}`
`296`	`284`
`297`	`285`	`[Fact]`
`298`		`- public async Task GroupBy12()`
	`286`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_Simple()`
`299`	`287`	`{`
`300`	`288`	`var xs = AsyncEnumerable.Range(0, 10);`
`301`	`289`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`@@ -334,7 +322,7 @@ public async Task GroupBy12()`
`334`	`322`	`}`
`335`	`323`
`336`	`324`	`[Fact]`
`337`		`- public async Task GroupBy13()`
	`325`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple1()`
`338`	`326`	`{`
`339`	`327`	`var xs = AsyncEnumerable.Range(0, 10);`
`340`	`328`	`var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));`
`@@ -373,33 +361,7 @@ public async Task GroupBy13()`
`373`	`361`	`}`
`374`	`362`
`375`	`363`	`[Fact]`
`376`		`- public async Task GroupBy14()`
`377`		`- {`
`378`		`- var xs = AsyncEnumerable.Range(0, 10);`
`379`		`- var ys = xs.GroupBy(x => x, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
`380`		`-`
`381`		`- var e = ys.GetAsyncEnumerator();`
`382`		`- await HasNextAsync(e, "0 - adgj");`
`383`		`- await HasNextAsync(e, "1 - beh");`
`384`		`- await HasNextAsync(e, "2 - cfi");`
`385`		`- await NoNextAsync(e);`
`386`		`- }`
`387`		`-`
`388`		`- [Fact]`
`389`		`- public async Task GroupBy15()`
`390`		`- {`
`391`		`- var xs = AsyncEnumerable.Range(0, 10);`
`392`		`- var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
`393`		`-`
`394`		`- var e = ys.GetAsyncEnumerator();`
`395`		`- await HasNextAsync(e, "0 - 0369");`
`396`		`- await HasNextAsync(e, "1 - 147");`
`397`		`- await HasNextAsync(e, "2 - 258");`
`398`		`- await NoNextAsync(e);`
`399`		`- }`
`400`		`-`
`401`		`- [Fact]`
`402`		`- public async Task GroupBy16()`
	`364`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple2()`
`403`	`365`	`{`
`404`	`366`	`var xs = AsyncEnumerable.Range(0, 10);`
`405`	`367`	`var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));`
`@@ -443,7 +405,33 @@ public async Task GroupBy16()`
`443`	`405`	`}`
`444`	`406`
`445`	`407`	`[Fact]`
`446`		`- public async Task GroupBy17()`
	`408`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Comparer_Simple1()`
	`409`	`+ {`
	`410`	`+ var xs = AsyncEnumerable.Range(0, 10);`
	`411`	`+ var ys = xs.GroupBy(x => x, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
	`412`	`+`
	`413`	`+ var e = ys.GetAsyncEnumerator();`
	`414`	`+ await HasNextAsync(e, "0 - adgj");`
	`415`	`+ await HasNextAsync(e, "1 - beh");`
	`416`	`+ await HasNextAsync(e, "2 - cfi");`
	`417`	`+ await NoNextAsync(e);`
	`418`	`+ }`
	`419`	`+`
	`420`	`+ [Fact]`
	`421`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Comparer_Simple2()`
	`422`	`+ {`
	`423`	`+ var xs = AsyncEnumerable.Range(0, 10);`
	`424`	`+ var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
	`425`	`+`
	`426`	`+ var e = ys.GetAsyncEnumerator();`
	`427`	`+ await HasNextAsync(e, "0 - 0369");`
	`428`	`+ await HasNextAsync(e, "1 - 147");`
	`429`	`+ await HasNextAsync(e, "2 - 258");`
	`430`	`+ await NoNextAsync(e);`
	`431`	`+ }`
	`432`	`+`
	`433`	`+ [Fact]`
	`434`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_DisposeEarly()`
`447`	`435`	`{`
`448`	`436`	`var xs = AsyncEnumerable.Range(0, 10);`
`449`	`437`	`var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));`
`@@ -455,7 +443,7 @@ public async Task GroupBy17()`
`455`	`443`	`}`
`456`	`444`
`457`	`445`	`[Fact]`
`458`		`- public async Task GroupBy18()`
	`446`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Comparer_Simple()`
`459`	`447`	`{`
`460`	`448`	`var xs = AsyncEnumerable.Range(0, 10);`
`461`	`449`	`var ys = xs.GroupBy(x => x, x => (char)('a' + x), new EqMod(3));`
`@@ -480,7 +468,7 @@ public async Task GroupBy18()`
`480`	`468`	`}`
`481`	`469`
`482`	`470`	`[Fact]`
`483`		`- public async Task GroupBy19()`
	`471`	`+ public async Task GroupBy_KeySelector_Sync_SequenceIdentity()`
`484`	`472`	`{`
`485`	`473`	`// We're using Kvp here because the types will eval as equal for this test`
`486`	`474`	`var xs = new[]`
`@@ -501,9 +489,8 @@ public async Task GroupBy19()`
`501`	`489`	`await SequenceIdentity(res);`
`502`	`490`	`}`
`503`	`491`
`504`		`-`
`505`	`492`	`[Fact]`
`506`		`- public async Task GroupBy20()`
	`493`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_ToArray()`
`507`	`494`	`{`
`508`	`495`	`var xs = AsyncEnumerable.Range(0, 10);`
`509`	`496`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -514,7 +501,7 @@ public async Task GroupBy20()`
`514`	`501`	`}`
`515`	`502`
`516`	`503`	`[Fact]`
`517`		`- public async Task GroupBy21()`
	`504`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_ToList()`
`518`	`505`	`{`
`519`	`506`	`var xs = AsyncEnumerable.Range(0, 10);`
`520`	`507`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -525,7 +512,7 @@ public async Task GroupBy21()`
`525`	`512`	`}`
`526`	`513`
`527`	`514`	`[Fact]`
`528`		`- public async Task GroupBy22()`
	`515`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_Count()`
`529`	`516`	`{`
`530`	`517`	`var xs = AsyncEnumerable.Range(0, 10);`
`531`	`518`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -534,7 +521,7 @@ public async Task GroupBy22()`
`534`	`521`	`}`
`535`	`522`
`536`	`523`	`[Fact]`
`537`		`- public async Task GroupBy23()`
	`524`	`+ public async Task GroupBy_KeySelector_ElementSelector_ResultSelector_Sync_SequenceIdentity()`
`538`	`525`	`{`
`539`	`526`	`var xs = AsyncEnumerable.Range(0, 10);`
`540`	`527`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x), (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result);`
`@@ -543,7 +530,7 @@ public async Task GroupBy23()`
`543`	`530`	`}`
`544`	`531`
`545`	`532`	`[Fact]`
`546`		`- public async Task GroupBy24()`
	`533`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_ToArray()`
`547`	`534`	`{`
`548`	`535`	`var xs = AsyncEnumerable.Range(0, 10);`
`549`	`536`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -572,7 +559,7 @@ public async Task GroupBy24()`
`572`	`559`	`}`
`573`	`560`
`574`	`561`	`[Fact]`
`575`		`- public async Task GroupBy25()`
	`562`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_ToList()`
`576`	`563`	`{`
`577`	`564`	`var xs = AsyncEnumerable.Range(0, 10);`
`578`	`565`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -599,7 +586,7 @@ public async Task GroupBy25()`
`599`	`586`	`}`
`600`	`587`
`601`	`588`	`[Fact]`
`602`		`- public async Task GroupBy26()`
	`589`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Group_Count()`
`603`	`590`	`{`
`604`	`591`	`var xs = AsyncEnumerable.Range(0, 10);`
`605`	`592`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -622,7 +609,7 @@ public async Task GroupBy26()`
`622`	`609`	`}`
`623`	`610`
`624`	`611`	`[Fact]`
`625`		`- public async Task GroupBy27()`
	`612`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_Count()`
`626`	`613`	`{`
`627`	`614`	`var xs = AsyncEnumerable.Range(0, 10);`
`628`	`615`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -633,7 +620,7 @@ public async Task GroupBy27()`
`633`	`620`	`}`
`634`	`621`
`635`	`622`	`[Fact]`
`636`		`- public async Task GroupBy28()`
	`623`	`+ public async Task GroupBy_KeySelector_ElementSelector_Sync_SequenceIdentity()`
`637`	`624`	`{`
`638`	`625`	`var xs = AsyncEnumerable.Range(0, 10);`
`639`	`626`	`var ys = xs.GroupBy(x => x % 3, x => (char)('a' + x));`
`@@ -642,7 +629,7 @@ public async Task GroupBy28()`
`642`	`629`	`}`
`643`	`630`
`644`	`631`	`[Fact]`
`645`		`- public async Task GroupBy29()`
	`632`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_Group_ToList()`
`646`	`633`	`{`
`647`	`634`	`var xs = AsyncEnumerable.Range(0, 10);`
`648`	`635`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`@@ -669,12 +656,11 @@ public async Task GroupBy29()`
`669`	`656`	`}`
`670`	`657`
`671`	`658`	`[Fact]`
`672`		`- public async Task GroupBy30()`
	`659`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_Group_Count()`
`673`	`660`	`{`
`674`	`661`	`var xs = AsyncEnumerable.Range(0, 10);`
`675`	`662`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`676`	`663`
`677`		`-`
`678`	`664`	`var gar = await ys.ToListAsync();`
`679`	`665`
`680`	`666`	`Assert.Equal(3, gar.Count);`
`@@ -693,7 +679,7 @@ public async Task GroupBy30()`
`693`	`679`	`}`
`694`	`680`
`695`	`681`	`[Fact]`
`696`		`- public async Task GroupBy31()`
	`682`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_Group_ToArray()`
`697`	`683`	`{`
`698`	`684`	`var xs = AsyncEnumerable.Range(0, 10);`
`699`	`685`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`@@ -722,7 +708,7 @@ public async Task GroupBy31()`
`722`	`708`	`}`
`723`	`709`
`724`	`710`	`[Fact]`
`725`		`- public async Task GroupBy32()`
	`711`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_Count()`
`726`	`712`	`{`
`727`	`713`	`var xs = AsyncEnumerable.Range(0, 10);`
`728`	`714`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`@@ -733,7 +719,7 @@ public async Task GroupBy32()`
`733`	`719`	`}`
`734`	`720`
`735`	`721`	`[Fact]`
`736`		`- public async Task GroupBy33()`
	`722`	`+ public async Task GroupBy_KeySelector_Sync_Comparer_SequenceIdentity()`
`737`	`723`	`{`
`738`	`724`	`var xs = AsyncEnumerable.Range(0, 10);`
`739`	`725`	`var ys = xs.GroupBy(x => x, new EqMod(3));`
`@@ -742,7 +728,7 @@ public async Task GroupBy33()`
`742`	`728`	`}`
`743`	`729`
`744`	`730`	`[Fact]`
`745`		`- public async Task GroupBy34()`
	`731`	`+ public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_ToArray()`
`746`	`732`	`{`
`747`	`733`	`var xs = AsyncEnumerable.Range(0, 10);`
`748`	`734`	`var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
`@@ -753,7 +739,7 @@ public async Task GroupBy34()`
`753`	`739`	`}`
`754`	`740`
`755`	`741`	`[Fact]`
`756`		`- public async Task GroupBy35()`
	`742`	`+ public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_ToList()`
`757`	`743`	`{`
`758`	`744`	`var xs = AsyncEnumerable.Range(0, 10);`
`759`	`745`	`var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
`@@ -764,7 +750,7 @@ public async Task GroupBy35()`
`764`	`750`	`}`
`765`	`751`
`766`	`752`	`[Fact]`
`767`		`- public async Task GroupBy36()`
	`753`	`+ public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_Count()`
`768`	`754`	`{`
`769`	`755`	`var xs = AsyncEnumerable.Range(0, 10);`
`770`	`756`	`var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`
`@@ -773,7 +759,7 @@ public async Task GroupBy36()`
`773`	`759`	`}`
`774`	`760`
`775`	`761`	`[Fact]`
`776`		`- public async Task GroupBy37()`
	`762`	`+ public async Task GroupBy_KeySelector_ResultSelector_Sync_Comparer_SequenceIdentity()`
`777`	`763`	`{`
`778`	`764`	`var xs = AsyncEnumerable.Range(0, 10);`
`779`	`765`	`var ys = xs.GroupBy(x => x, (k, cs) => k + " - " + cs.AggregateAsync("", (a, c) => a + c).Result, new EqMod(3));`