From fcbde80682939636c7aa49da99018252dfa1b1c2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@github.com>
Date: Thu, 14 Dec 2017 19:35:30 +0100
Subject: [PATCH] Added a couple of tests.

---
 src/Avalonia.Styling/Styling/ActivatedValue.cs     |  4 ++++
 .../ActivatedObservableTests.cs                    |  7 ++++---
 .../ActivatedValueTests.cs                         | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Styling/Styling/ActivatedValue.cs b/src/Avalonia.Styling/Styling/ActivatedValue.cs
index 683121628c..a68ae1e435 100644
--- a/src/Avalonia.Styling/Styling/ActivatedValue.cs
+++ b/src/Avalonia.Styling/Styling/ActivatedValue.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
+using Avalonia.Threading;
 
 namespace Avalonia.Styling
 {
@@ -75,6 +76,9 @@ namespace Avalonia.Styling
 
         public virtual IDisposable Subscribe(IObserver<object> observer)
         {
+            Contract.Requires<ArgumentNullException>(observer != null);
+            Dispatcher.UIThread.VerifyAccess();
+
             _observers.Add(observer);
 
             if (_observers.Count == 1)
diff --git a/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs b/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs
index d5d1d3b01c..7773d4767a 100644
--- a/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ActivatedObservableTests.cs
@@ -54,15 +54,16 @@ namespace Avalonia.Styling.UnitTests
         }
 
         [Fact]
-        public void Should_Complete_When_Activator_Completes()
+        public void Should_Error_When_Source_Errors()
         {
             var activator = new BehaviorSubject<bool>(false);
             var source = new BehaviorSubject<object>(1);
             var target = new ActivatedObservable(activator, source, string.Empty);
+            var error = new Exception();
             var completed = false;
 
-            target.Subscribe(_ => { }, () => completed = true);
-            activator.OnCompleted();
+            target.Subscribe(_ => { }, x => completed = true);
+            source.OnError(error);
 
             Assert.True(completed);
         }
diff --git a/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs b/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs
index e2cc470a1e..92a7c1bd1f 100644
--- a/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ActivatedValueTests.cs
@@ -40,6 +40,20 @@ namespace Avalonia.Styling.UnitTests
             Assert.True(completed);
         }
 
+        [Fact]
+        public void Should_Error_When_Activator_Errors()
+        {
+            var activator = new BehaviorSubject<bool>(false);
+            var target = new ActivatedValue(activator, 1, string.Empty);
+            var error = new Exception();
+            var completed = false;
+
+            target.Subscribe(_ => { }, x => completed = true);
+            activator.OnError(error);
+
+            Assert.True(completed);
+        }
+
         [Fact]
         public void Should_Unsubscribe_From_Activator_When_All_Subscriptions_Disposed()
         {