Clean up SkipWhile and TakeWhile test code.

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

@@ -12,7 +12,7 @@ namespace Tests
     public class SkipWhile : AsyncEnumerableTests
     {
         [Fact]
-        public void SkipWhile_Null()
+        public void SkipWhile_Sync_Null()
         {
             Assert.Throws<ArgumentNullException>(() => AsyncEnumerable.SkipWhile<int>(default, x => true));
             Assert.Throws<ArgumentNullException>(() => AsyncEnumerable.SkipWhile<int>(default, (x, i) => true));
@@ -21,7 +21,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile1Async()
+        public async Task SkipWhile_Sync_Simple1()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile(x => x < 3);
@@ -33,46 +33,46 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile2Async()
+        public async Task SkipWhile_Sync_Simple2()
         {
-            var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
-            var ys = xs.SkipWhile(x => false);
+            var xs = new[] { 1, 2, 3, 4, 3, 2, 1 }.ToAsyncEnumerable();
+            var ys = xs.SkipWhile(x => x < 3);
 
             var e = ys.GetAsyncEnumerator();
-            await HasNextAsync(e, 1);
-            await HasNextAsync(e, 2);
             await HasNextAsync(e, 3);
             await HasNextAsync(e, 4);
+            await HasNextAsync(e, 3);
+            await HasNextAsync(e, 2);
+            await HasNextAsync(e, 1);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task SkipWhile3Async()
+        public async Task SkipWhile_Sync_False()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
-            var ys = xs.SkipWhile(x => true);
+            var ys = xs.SkipWhile(x => false);
 
             var e = ys.GetAsyncEnumerator();
+            await HasNextAsync(e, 1);
+            await HasNextAsync(e, 2);
+            await HasNextAsync(e, 3);
+            await HasNextAsync(e, 4);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task SkipWhile4Async()
+        public async Task SkipWhile_Sync_True()
         {
-            var xs = new[] { 1, 2, 3, 4, 3, 2, 1 }.ToAsyncEnumerable();
-            var ys = xs.SkipWhile(x => x < 3);
+            var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
+            var ys = xs.SkipWhile(x => true);
 
             var e = ys.GetAsyncEnumerator();
-            await HasNextAsync(e, 3);
-            await HasNextAsync(e, 4);
-            await HasNextAsync(e, 3);
-            await HasNextAsync(e, 2);
-            await HasNextAsync(e, 1);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task SkipWhile5Async()
+        public async Task SkipWhile_Sync_Throws_Predicate()
         {
             var ex = new Exception("Bang");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -83,7 +83,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile6Async()
+        public async Task SkipWhile_Sync_Indexed()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile((x, i) => i < 2);
@@ -95,7 +95,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile7Async()
+        public async Task SkipWhile_Sync_Indexed_False()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile((x, i) => false);
@@ -109,7 +109,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile8Async()
+        public async Task SkipWhile_Sync_Indexed_True()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile((x, i) => true);
@@ -119,7 +119,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile9Async()
+        public async Task SkipWhile_Sync_Indexed_Throws_Predicate()
         {
             var ex = new Exception("Bang");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -130,7 +130,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile10()
+        public async Task SkipWhile_Sync_SequenceIdentity()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile(x => x < 3);
@@ -139,7 +139,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task SkipWhile11()
+        public async Task SkipWhile_Sync_Indexed_SequenceIdentity()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.SkipWhile((x, i) => false);

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

@@ -12,7 +12,7 @@ namespace Tests
     public class TakeWhile : AsyncEnumerableTests
     {
         [Fact]
-        public void TakeWhile_Null()
+        public void TakeWhile_Sync_Null()
         {
             Assert.Throws<ArgumentNullException>(() => AsyncEnumerable.TakeWhile<int>(default, x => true));
             Assert.Throws<ArgumentNullException>(() => AsyncEnumerable.TakeWhile<int>(default, (x, i) => true));
@@ -21,7 +21,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile1Async()
+        public async Task TakeWhile_Sync_Simple1()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile(x => x < 3);
@@ -33,43 +33,43 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile2Async()
+        public async Task TakeWhile_Sync_Simple2()
         {
-            var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
-            var ys = xs.TakeWhile(x => false);
+            var xs = new[] { 1, 2, 3, 4, 3, 2, 1 }.ToAsyncEnumerable();
+            var ys = xs.TakeWhile(x => x < 3);
 
             var e = ys.GetAsyncEnumerator();
+            await HasNextAsync(e, 1);
+            await HasNextAsync(e, 2);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task TakeWhile3Async()
+        public async Task TakeWhile_Sync_False()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
-            var ys = xs.TakeWhile(x => true);
+            var ys = xs.TakeWhile(x => false);
 
             var e = ys.GetAsyncEnumerator();
-            await HasNextAsync(e, 1);
-            await HasNextAsync(e, 2);
-            await HasNextAsync(e, 3);
-            await HasNextAsync(e, 4);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task TakeWhile4Async()
+        public async Task TakeWhile_Sync_True()
         {
-            var xs = new[] { 1, 2, 3, 4, 3, 2, 1 }.ToAsyncEnumerable();
-            var ys = xs.TakeWhile(x => x < 3);
+            var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
+            var ys = xs.TakeWhile(x => true);
 
             var e = ys.GetAsyncEnumerator();
             await HasNextAsync(e, 1);
             await HasNextAsync(e, 2);
+            await HasNextAsync(e, 3);
+            await HasNextAsync(e, 4);
             await NoNextAsync(e);
         }
 
         [Fact]
-        public async Task TakeWhile5Async()
+        public async Task TakeWhile_Sync_Throws_Predicate()
         {
             var ex = new Exception("Bang");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -80,7 +80,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile6Async()
+        public async Task TakeWhile_Sync_Indexed()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile((x, i) => i < 2);
@@ -92,7 +92,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile7Async()
+        public async Task TakeWhile_Sync_Indexed_False()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile((x, i) => false);
@@ -102,7 +102,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile8Async()
+        public async Task TakeWhile_Sync_Indexed_True()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile((x, i) => true);
@@ -116,7 +116,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile9Async()
+        public async Task TakeWhile_Sync_Indexed_Throws_Predicate()
         {
             var ex = new Exception("Bang");
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
@@ -128,7 +128,7 @@ namespace Tests
 
 
         [Fact]
-        public async Task TakeWhile10()
+        public async Task TakeWhile_Sync_SequenceIdentity()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile(x => x < 3);
@@ -137,7 +137,7 @@ namespace Tests
         }
 
         [Fact]
-        public async Task TakeWhile11()
+        public async Task TakeWhile_Sync_Indexed_SequenceIdentity()
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.TakeWhile((x, i) => i < 2);