Moving Finally tests.

Ix.NET/Source/System.Interactive.Async.Tests/AsyncTests.Exceptions.cs

@@ -12,112 +12,6 @@ namespace Tests
 {
     public partial class AsyncTests
     {
-        [Fact]
-        public void Finally_Null()
-        {
-            AssertThrows<ArgumentNullException>(() => AsyncEnumerableEx.Finally(default(IAsyncEnumerable<int>), () => { }));
-            AssertThrows<ArgumentNullException>(() => AsyncEnumerableEx.Finally(AsyncEnumerable.Return(42), null));
-        }
-
-        [Fact]
-        public void Finally1()
-        {
-            var b = false;
-
-            var xs = AsyncEnumerable.Empty<int>().Finally(() => { b = true; });
-
-            var e = xs.GetAsyncEnumerator();
-
-            Assert.False(b);
-            NoNext(e);
-
-            Assert.True(b);
-        }
-
-        [Fact]
-        public void Finally2()
-        {
-            var b = false;
-
-            var xs = AsyncEnumerable.Return(42).Finally(() => { b = true; });
-
-            var e = xs.GetAsyncEnumerator();
-
-            Assert.False(b);
-            HasNext(e, 42);
-
-            Assert.False(b);
-            NoNext(e);
-
-            Assert.True(b);
-        }
-
-        [Fact]
-        public void Finally3()
-        {
-            var ex = new Exception("Bang!");
-
-            var b = false;
-
-            var xs = AsyncEnumerable.Throw<int>(ex).Finally(() => { b = true; });
-
-            var e = xs.GetAsyncEnumerator();
-
-            Assert.False(b);
-            AssertThrows(() => e.MoveNextAsync().Wait(WaitTimeoutMs), (Exception ex_) => ((AggregateException)ex_).Flatten().InnerExceptions.Single() == ex);
-
-            Assert.True(b);
-        }
-
-        [Fact]
-        public void Finally4()
-        {
-            var b = false;
-
-            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { b = true; });
-
-            var e = xs.GetAsyncEnumerator();
-
-            Assert.False(b);
-            HasNext(e, 1);
-
-            Assert.False(b);
-            HasNext(e, 2);
-
-            Assert.False(b);
-            NoNext(e);
-
-            Assert.True(b);
-        }
-
-        [Fact]
-        public async Task Finally5()
-        {
-            var b = false;
-
-            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { b = true; });
-
-            var e = xs.GetAsyncEnumerator();
-
-            Assert.False(b);
-            HasNext(e, 1);
-
-            await e.DisposeAsync();
-
-            Assert.True(b);
-        }
-
-        [Fact]
-        public async Task Finally7()
-        {
-            var i = 0;
-            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { i++; });
-
-            await SequenceIdentity(xs);
-            Assert.Equal(2, i);
-        }
-
-
         [Fact]
         public void OnErrorResumeNext_Null()
         {

Ix.NET/Source/System.Interactive.Async.Tests/System/Linq/Operators/Finally.cs

@@ -0,0 +1,120 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information. 
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Tests
+{
+    public class Finally : AsyncEnumerableExTests
+    {
+        [Fact]
+        public void Finally_Null()
+        {
+            AssertThrows<ArgumentNullException>(() => AsyncEnumerableEx.Finally(default(IAsyncEnumerable<int>), () => { }));
+            AssertThrows<ArgumentNullException>(() => AsyncEnumerableEx.Finally(AsyncEnumerable.Return(42), null));
+        }
+
+        [Fact]
+        public void Finally1()
+        {
+            var b = false;
+
+            var xs = AsyncEnumerable.Empty<int>().Finally(() => { b = true; });
+
+            var e = xs.GetAsyncEnumerator();
+
+            Assert.False(b);
+            NoNext(e);
+
+            Assert.True(b);
+        }
+
+        [Fact]
+        public void Finally2()
+        {
+            var b = false;
+
+            var xs = AsyncEnumerable.Return(42).Finally(() => { b = true; });
+
+            var e = xs.GetAsyncEnumerator();
+
+            Assert.False(b);
+            HasNext(e, 42);
+
+            Assert.False(b);
+            NoNext(e);
+
+            Assert.True(b);
+        }
+
+        [Fact]
+        public void Finally3()
+        {
+            var ex = new Exception("Bang!");
+
+            var b = false;
+
+            var xs = AsyncEnumerable.Throw<int>(ex).Finally(() => { b = true; });
+
+            var e = xs.GetAsyncEnumerator();
+
+            Assert.False(b);
+            AssertThrows(() => e.MoveNextAsync().Wait(WaitTimeoutMs), (Exception ex_) => ((AggregateException)ex_).Flatten().InnerExceptions.Single() == ex);
+
+            Assert.True(b);
+        }
+
+        [Fact]
+        public void Finally4()
+        {
+            var b = false;
+
+            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { b = true; });
+
+            var e = xs.GetAsyncEnumerator();
+
+            Assert.False(b);
+            HasNext(e, 1);
+
+            Assert.False(b);
+            HasNext(e, 2);
+
+            Assert.False(b);
+            NoNext(e);
+
+            Assert.True(b);
+        }
+
+        [Fact]
+        public async Task Finally5()
+        {
+            var b = false;
+
+            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { b = true; });
+
+            var e = xs.GetAsyncEnumerator();
+
+            Assert.False(b);
+            HasNext(e, 1);
+
+            await e.DisposeAsync();
+
+            Assert.True(b);
+        }
+
+        [Fact]
+        public async Task Finally7()
+        {
+            var i = 0;
+            var xs = new[] { 1, 2 }.ToAsyncEnumerable().Finally(() => { i++; });
+
+            await SequenceIdentity(xs);
+            Assert.Equal(2, i);
+        }
+    }
+}