Merge pull request #1085 from kentcb/rxcommand-thrownexceptions

Ensure exceptions are delivered on output scheduler.
reactiveui · Mar 18, 2016 · 362de53 · 362de53
2 parents 32356c1 + 0bdd971
commit 362de53
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/ReactiveUI.Tests/ReactiveCommandTest.cs b/ReactiveUI.Tests/ReactiveCommandTest.cs
@@ -301,6 +301,27 @@ public void ExecuteAsyncTicksAnyLambdaException()
             Assert.IsType<InvalidOperationException>(exception);
         }
 
+        [Fact]
+        public void ExceptionsAreDeliveredOnOutputScheduler()
+        {
+            (new TestScheduler()).With(sched => {
+                var fixture = ReactiveCommand.CreateFromObservable(() => Observable.Throw<Unit>(new InvalidOperationException()), outputScheduler: sched);
+                Exception exception = null;
+                fixture
+                    .ThrownExceptions
+                    .Subscribe(ex => exception = ex);
+                fixture
+                    .ExecuteAsync()
+                    .Subscribe(
+                        _ => { },
+                        ex => { });
+
+                Assert.Null(exception);
+                sched.Start();
+                Assert.IsType<InvalidOperationException>(exception);
+            });
+        }
+
         [Fact]
         public void ExecuteIsAvailableViaICommand()
         {
@@ -635,5 +656,28 @@ public void ExecuteAsyncTicksErrorsInAnyChildCommandThroughThrownExceptions()
             Assert.Equal(1, thrownExceptions.Count);
             Assert.Equal("oops", thrownExceptions[0].Message);
         }
+
+        [Fact]
+        public void ExceptionsAreDeliveredOnOutputScheduler()
+        {
+            (new TestScheduler()).With(sched => {
+                var child = ReactiveCommand.CreateFromObservable(() => Observable.Throw<Unit>(new InvalidOperationException("oops")));
+                var childCommands = new[] { child };
+                var fixture = ReactiveCommand.CreateCombined(childCommands, outputScheduler: sched);
+                Exception exception = null;
+                fixture
+                    .ThrownExceptions
+                    .Subscribe(ex => exception = ex);
+                fixture
+                    .ExecuteAsync()
+                    .Subscribe(
+                        _ => { },
+                        ex => { });
+
+                Assert.Null(exception);
+                sched.Start();
+                Assert.IsType<InvalidOperationException>(exception);
+            });
+        }
     }
 }
diff --git a/ReactiveUI/ReactiveCommand.cs b/ReactiveUI/ReactiveCommand.cs
@@ -647,7 +647,7 @@ internal protected ReactiveCommand(
                 .Where(x => x.Demarcation == ExecutionDemarcation.EndWithResult)
                 .Select(x => x.Result);
 
-            this.exceptions = new ScheduledSubject<Exception>(CurrentThreadScheduler.Instance, RxApp.DefaultExceptionHandler);
+            this.exceptions = new ScheduledSubject<Exception>(outputScheduler, RxApp.DefaultExceptionHandler);
 
             this
                 .canExecute
@@ -842,7 +842,7 @@ internal protected CombinedReactiveCommand(
                 .ThrownExceptions
                 .Subscribe();
 
-            this.exceptions = new ScheduledSubject<Exception>(CurrentThreadScheduler.Instance, RxApp.DefaultExceptionHandler);
+            this.exceptions = new ScheduledSubject<Exception>(outputScheduler, RxApp.DefaultExceptionHandler);
 
             this
                 .CanExecute