Specify scheduler in ListenerCollectionTests too.

Author: grokys

test/TrackingCollectionTests/ListenerCollectionTests.cs

@@ -1,56 +1,70 @@
 using System;
 using System.Linq;
+using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using GitHub.Collections;
 using NUnit.Framework;
+using ReactiveUI.Testing;
 
 [TestFixture]
 public class ListenerCollectionTests : TestBase
 {
     [Test]
     public void StickyItemShouldNotBePresentInitiallyWhereNoSelectionHasHappened()
     {
-        var source = CreateSource();
-        var stickie = new Thing();
-        var selection = Observable.Empty<Thing>();
-        var target = source.CreateListenerCollection(stickie, selection);
-
-        CollectionAssert.AreEqual(source, target);
+        using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+        {
+            var source = CreateSource();
+            var stickie = new Thing();
+            var selection = Observable.Empty<Thing>();
+            var target = source.CreateListenerCollection(stickie, selection);
+
+            CollectionAssert.AreEqual(source, target);
+        }
     }
 
     [Test]
     public void StickyItemShouldNotBePresentAfterCreationWhenSelectionNull()
     {
-        var source = CreateSource();
-        var stickie = new Thing();
-        var selection = Observable.Return<Thing>(null);
-        var target = source.CreateListenerCollection(stickie, selection);
-
-        CollectionAssert.AreEqual(source, target);
+        using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+        {
+            var source = CreateSource();
+            var stickie = new Thing();
+            var selection = Observable.Return<Thing>(null);
+            var target = source.CreateListenerCollection(stickie, selection);
+
+            CollectionAssert.AreEqual(source, target);
+        }
     }
 
     [Test]
     public void StickyItemShouldBePresentAfterCreationWhenSelectionNotNull()
     {
-        var source = CreateSource();
-        var stickie = new Thing();
-        var selection = Observable.Return(source[0]);
-        var target = source.CreateListenerCollection(stickie, selection);
-
-        var expected = new[] { stickie }.Concat(source);
-        CollectionAssert.AreEqual(expected, target);
+        using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+        {
+            var source = CreateSource();
+            var stickie = new Thing();
+            var selection = Observable.Return(source[0]);
+            var target = source.CreateListenerCollection(stickie, selection);
+
+            var expected = new[] { stickie }.Concat(source);
+            CollectionAssert.AreEqual(expected, target);
+        }
     }
 
     [Test]
     public void StickyItemShouldNotBePresentAfterCreationWhenSelectionIsStickyItem()
     {
-        var source = CreateSource();
-        var stickie = new Thing();
-        var selection = Observable.Return(stickie);
-        var target = source.CreateListenerCollection(stickie, selection);
-
-        CollectionAssert.AreEqual(source, target);
+        using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+        {
+            var source = CreateSource();
+            var stickie = new Thing();
+            var selection = Observable.Return(stickie);
+            var target = source.CreateListenerCollection(stickie, selection);
+
+            CollectionAssert.AreEqual(source, target);
+        }
     }
 
     [Test]
@@ -115,15 +129,18 @@ public void StickyItemShouldBeRemovedWhenSelectionChangesToStickyItem()
     [Test]
     public void ResetingTrackingCollectionWorks()
     {
-        var source = CreateSource();
-        var stickie = new Thing();
-        var selection = new ReplaySubject<Thing>();
-        var target = source.CreateListenerCollection(stickie, selection);
-        selection.OnNext(stickie);
-        selection.OnNext(null);
-        CollectionAssert.AreEqual(source, target);
-        source.Filter = (a,b,c) => true;
-        CollectionAssert.AreEqual(source, target);
+        using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+        {
+            var source = CreateSource();
+            var stickie = new Thing();
+            var selection = new ReplaySubject<Thing>();
+            var target = source.CreateListenerCollection(stickie, selection);
+            selection.OnNext(stickie);
+            selection.OnNext(null);
+            CollectionAssert.AreEqual(source, target);
+            source.Filter = (a, b, c) => true;
+            CollectionAssert.AreEqual(source, target);
+        }
     }
 
     TrackingCollection<Thing> CreateSource()

test/TrackingCollectionTests/TrackingCollectionTests.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj" />
+    <ProjectReference Include="..\..\submodules\reactiveui\src\ReactiveUI.Testing\ReactiveUI.Testing.csproj" />
   </ItemGroup>
 
   <ItemGroup>