Merge pull request #772 from flagbug/fix-async-withscheduler

Use an AutoResetEvent instead of a Monitor in TestScheduler.WithScheduler

Author: anaisbetts

ReactiveUI.Testing/TestUtils.cs

@@ -12,7 +12,7 @@ namespace ReactiveUI.Testing
 {
     public static class TestUtils
     {
-        static readonly object schedGate = 42;
+        static readonly AutoResetEvent schedGate = new AutoResetEvent(true);
         static readonly object mbGate = 42;
 
         /// <summary>
@@ -26,7 +26,7 @@ public static class TestUtils
         /// schedulers.</returns>
         public static IDisposable WithScheduler(IScheduler sched)
         {
-            Monitor.Enter(schedGate);
+            schedGate.WaitOne();
             var prevDef = RxApp.MainThreadScheduler;
             var prevTask = RxApp.TaskpoolScheduler;
 
@@ -36,7 +36,7 @@ public static IDisposable WithScheduler(IScheduler sched)
             return Disposable.Create(() => {
                 RxApp.MainThreadScheduler = prevDef;
                 RxApp.TaskpoolScheduler = prevTask;
-                Monitor.Exit(schedGate);
+                schedGate.Set();
             });
         }
 

ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj

@@ -103,6 +103,7 @@
     <Compile Include="AwaiterTest.cs" />
     <Compile Include="BindingTypeConvertersTest.cs" />
     <Compile Include="CommandBindingTests.cs" />
+    <Compile Include="TestUtilsTest.cs" />
     <Compile Include="WeakEventManagerTest.cs" />
     <Compile Include="Winforms\ActivationTests.cs" />
     <Compile Include="Winforms\CommandBindingTests.cs">

ReactiveUI.Tests/TestUtilsTest.cs

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Microsoft.Reactive.Testing;
+using ReactiveUI.Testing;
+using Xunit;
+
+namespace ReactiveUI.Tests
+{
+    public class TestUtilsTest
+    {
+        [Fact]
+        public async Task WithAsyncScheduler()
+        {
+            await new TestScheduler().WithAsync(_ => Task.Run(() => { }));
+        }
+    }
+}