Bart De Smet пре 8 година
родитељ
комит
9472aa9f83

+ 31 - 54
Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/Append.cs

@@ -51,14 +51,11 @@ namespace Tests
         public async Task Append3()
         {
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
+
             var res = xs.Append(4);
-            var a = new List<int>
-            {
-                1,
-                2,
-                3,
-                4
-            };
+
+            var a = new List<int> { 1, 2, 3, 4 };
+
             var arr = await res.ToList();
             Assert.Equal(a, arr);
         }
@@ -69,14 +66,14 @@ namespace Tests
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
 
             var res = xs.Append(4);
+
             Assert.Equal(4, await res.Count());
         }
 
         [Fact]
         public async Task Append5()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Append(4);
 
@@ -89,26 +86,22 @@ namespace Tests
         [Fact]
         public async Task Append6()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Append(4);
+
             Assert.Equal(4, await res.Count());
         }
 
         [Fact]
         public async Task Append7()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
+
             var res = xs.Append(4);
-            var a = new List<int>
-            {
-                1,
-                2,
-                3,
-                4
-            };
+
+            var a = new List<int> { 1, 2, 3, 4 };
+
             var arr = await res.ToList();
             Assert.Equal(a, arr);
         }
@@ -153,30 +146,33 @@ namespace Tests
         public async Task AppendN3()
         {
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
+
             var res = xs.Append(4)
                         .Append(5)
                         .Append(6);
 
-            var a = new List<int>
-            {
-                1,
-                2,
-                3,
-                4,
-                5,
-                6
-            };
+            var a = new List<int> { 1, 2, 3, 4, 5, 6 };
 
             var arr = await res.ToList();
             Assert.Equal(a, arr);
         }
 
+        [Fact]
+        public async Task AppendN4()
+        {
+            var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
+
+            var res = xs.Append(4)
+                        .Append(5)
+                        .Append(6);
+
+            Assert.Equal(6, await res.Count());
+        }
 
         [Fact]
         public async Task AppendN5()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Append(4)
                         .Append(5)
@@ -191,21 +187,13 @@ namespace Tests
         [Fact]
         public async Task AppendN6()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
+
             var res = xs.Append(4)
                         .Append(5)
                         .Append(6);
 
-            var a = new List<int>
-            {
-                1,
-                2,
-                3,
-                4,
-                5,
-                6
-            };
+            var a = new List<int> { 1, 2, 3, 4, 5, 6 };
 
             var arr = await res.ToList();
             Assert.Equal(a, arr);
@@ -214,23 +202,12 @@ namespace Tests
         [Fact]
         public async Task AppendN7()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Append(4)
                         .Append(5)
                         .Append(6);
-            Assert.Equal(6, await res.Count());
-        }
 
-        [Fact]
-        public async Task AppenN4()
-        {
-            var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
-
-            var res = xs.Append(4)
-                        .Append(5)
-                        .Append(6);
             Assert.Equal(6, await res.Count());
         }
     }

+ 21 - 50
Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/Prepend.cs

@@ -51,19 +51,15 @@ namespace Tests
         public async Task Prepend3()
         {
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
+
             var res = xs.Prepend(4);
-            var a = new List<int>
-            {
-                4,
-                1,
-                2,
-                3
-            };
+
+            var a = new List<int> { 4, 1, 2, 3 };
+
             var arr = await res.ToList();
             Assert.Equal(a, arr);
         }
 
-
         [Fact]
         public async Task Prepend4()
         {
@@ -73,12 +69,10 @@ namespace Tests
             Assert.Equal(4, await res.Count());
         }
 
-
         [Fact]
         public async Task Prepend5()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Prepend(4);
 
@@ -91,37 +85,29 @@ namespace Tests
         [Fact]
         public async Task Prepend6()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
+
             var res = xs.Prepend(4);
-            var a = new List<int>
-            {
-                4,
-                1,
-                2,
-                3
-            };
+
+            var a = new List<int> { 4, 1, 2, 3 };
+
             var arr = await res.ToList();
             Assert.Equal(a, arr);
         }
 
-
         [Fact]
         public async Task Prepend7()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Prepend(4);
             Assert.Equal(4, await res.Count());
         }
 
-
         [Fact]
         public async Task Prepend8()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Prepend(4);
 
@@ -167,19 +153,12 @@ namespace Tests
         public async Task PrependN3()
         {
             var xs = new[] { 1, 2, 3 }.ToAsyncEnumerable();
+
             var res = xs.Prepend(4)
                         .Prepend(5)
                         .Prepend(6);
 
-            var a = new List<int>
-            {
-                6,
-                5,
-                4,
-                1,
-                2,
-                3
-            };
+            var a = new List<int> { 6, 5, 4, 1, 2, 3 };
 
             var arr = await res.ToList();
             Assert.Equal(a, arr);
@@ -193,14 +172,14 @@ namespace Tests
             var res = xs.Prepend(4)
                         .Prepend(5)
                         .Prepend(6);
+
             Assert.Equal(6, await res.Count());
         }
 
         [Fact]
         public async Task PrependN5()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Prepend(4)
                         .Prepend(5)
@@ -215,21 +194,13 @@ namespace Tests
         [Fact]
         public async Task PrependN6()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
+
             var res = xs.Prepend(4)
                         .Prepend(5)
                         .Prepend(6);
 
-            var a = new List<int>
-            {
-                6,
-                5,
-                4,
-                1,
-                2,
-                3
-            };
+            var a = new List<int> { 6, 5, 4, 1, 2, 3 };
 
             var arr = await res.ToList();
             Assert.Equal(a, arr);
@@ -238,12 +209,12 @@ namespace Tests
         [Fact]
         public async Task PrependN7()
         {
-            var xs = AsyncEnumerable.Range(1, 3)
-                                    .Where(i => true);
+            var xs = AsyncEnumerable.Range(1, 3).Where(i => true);
 
             var res = xs.Prepend(4)
                         .Prepend(5)
                         .Prepend(6);
+
             Assert.Equal(6, await res.Count());
         }
     }