diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/AppendPrependBenchmark.cs b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/AppendPrependBenchmark.cs index c4d1c39967..c60206e1ec 100644 --- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/AppendPrependBenchmark.cs +++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/AppendPrependBenchmark.cs @@ -1,10 +1,9 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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.Reactive.Linq; using System.Threading; using BenchmarkDotNet.Attributes; @@ -17,7 +16,7 @@ public class AppendPrependBenchmark [Params(1, 10, 100, 1000, 10000)] public int N; - int _store; + private int _store; [Benchmark(Baseline = true)] public void StartWithArray() diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/ToObservableBenchmark.cs b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/ToObservableBenchmark.cs index b6d7e68f8c..b8abb56ef5 100644 --- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/ToObservableBenchmark.cs +++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/ToObservableBenchmark.cs @@ -1,9 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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.Reactive.Linq; using System.Threading; @@ -17,7 +16,7 @@ public class ToObservableBenchmark [Params(1, 10, 100, 1000, 10000, 100000, 1000000)] public int N; - int _store; + private int _store; [Benchmark] public void Exact() diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs b/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs index 59028f9460..f0b9a28625 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs @@ -10,33 +10,33 @@ namespace Microsoft.Reactive.Testing { internal class MockObserver : ITestableObserver { - private TestScheduler scheduler; - private List>> messages; + private TestScheduler _scheduler; + private List>> _messages; public MockObserver(TestScheduler scheduler) { - this.scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); - messages = new List>>(); + this._scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); + _messages = new List>>(); } public void OnNext(T value) { - messages.Add(new Recorded>(scheduler.Clock, Notification.CreateOnNext(value))); + _messages.Add(new Recorded>(_scheduler.Clock, Notification.CreateOnNext(value))); } public void OnError(Exception exception) { - messages.Add(new Recorded>(scheduler.Clock, Notification.CreateOnError(exception))); + _messages.Add(new Recorded>(_scheduler.Clock, Notification.CreateOnError(exception))); } public void OnCompleted() { - messages.Add(new Recorded>(scheduler.Clock, Notification.CreateOnCompleted())); + _messages.Add(new Recorded>(_scheduler.Clock, Notification.CreateOnCompleted())); } public IList>> Messages { - get { return messages; } + get { return _messages; } } } } diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveAssert.cs b/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveAssert.cs index 250e1c34cb..c6c7548b9d 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveAssert.cs +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveAssert.cs @@ -285,7 +285,7 @@ public static void AssertEqual(this IEnumerable actual, IEnumerable exp throw new ArgumentNullException(nameof(expected)); } - ReactiveAssert.AreElementsEqual(expected, actual); + AreElementsEqual(expected, actual); } /// @@ -329,7 +329,7 @@ public static void AssertEqual(this IObservable actual, IObservable exp throw new ArgumentNullException(nameof(expected)); } - ReactiveAssert.AreElementsEqual(expected, actual); + AreElementsEqual(expected, actual); } } } diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveTest.cs b/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveTest.cs index e90a5fa7c6..0cafaf6fd9 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveTest.cs +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/ReactiveTest.cs @@ -36,7 +36,7 @@ public class ReactiveTest /// Recorded OnNext notification. public static Recorded> OnNext(long ticks, T value) { - return new Recorded>(ticks, Notification.CreateOnNext(value)); + return new Recorded>(ticks, Notification.CreateOnNext(value)); } /// @@ -188,7 +188,7 @@ public OnNextPredicate(Func predicate) public override bool Equals(Notification other) { - if (Object.ReferenceEquals(this, other)) + if (ReferenceEquals(this, other)) { return true; } @@ -218,7 +218,7 @@ public OnErrorPredicate(Func predicate) public override bool Equals(Notification other) { - if (Object.ReferenceEquals(this, other)) + if (ReferenceEquals(this, other)) { return true; } diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/TestScheduler.cs b/Rx.NET/Source/src/Microsoft.Reactive.Testing/TestScheduler.cs index f004458766..8bd795632a 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/TestScheduler.cs +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/TestScheduler.cs @@ -30,7 +30,7 @@ public override IDisposable ScheduleAbsolute(TState state, long dueTime, dueTime = Clock + 1; } - return base.ScheduleAbsolute(state, dueTime, action); + return base.ScheduleAbsolute(state, dueTime, action); } /// diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Repeat.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Repeat.cs index 3aac83a662..4cd1562aaa 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Repeat.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Repeat.cs @@ -28,7 +28,7 @@ internal sealed class _ : IdentitySink { private readonly TResult _value; - IDisposable _task; + private IDisposable _task; public _(TResult value, IObserver observer) : base(observer) @@ -127,9 +127,9 @@ internal sealed class _ : IdentitySink { private readonly TResult _value; - int _remaining; + private int _remaining; - IDisposable _task; + private IDisposable _task; public _(TResult value, int repeatCount, IObserver observer) : base(observer) @@ -197,8 +197,7 @@ internal sealed class _ : IdentitySink { private readonly TResult _value; - int _remaining; - + private readonly int _remaining; public _(TResult value, int remaining, IObserver observer) : base(observer) { diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/ToObservable.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/ToObservable.cs index 69fbe6847d..036dc82f04 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/ToObservable.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/ToObservable.cs @@ -26,9 +26,9 @@ public ToObservableRecursive(IEnumerable source, IScheduler scheduler) internal sealed class _ : IdentitySink { - IEnumerator _enumerator; + private IEnumerator _enumerator; - volatile bool _disposed; + private volatile bool _disposed; public _(IObserver observer) : base(observer) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/MockDisposable.cs b/Rx.NET/Source/tests/Tests.System.Reactive/MockDisposable.cs index 2139d755b8..3cf466da3f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/MockDisposable.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/MockDisposable.cs @@ -10,17 +10,17 @@ namespace ReactiveTests { public class MockDisposable : List, IDisposable { - private TestScheduler scheduler; + private TestScheduler _scheduler; public MockDisposable(TestScheduler scheduler) { - this.scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); + this._scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); Add(scheduler.Clock); } public void Dispose() { - Add(scheduler.Clock); + Add(_scheduler.Clock); } } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/MockEnumerable.cs b/Rx.NET/Source/tests/Tests.System.Reactive/MockEnumerable.cs index 7f5fd2203f..97bf53da8a 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/MockEnumerable.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/MockEnumerable.cs @@ -12,17 +12,17 @@ public class MockEnumerable : IEnumerable { public readonly TestScheduler Scheduler; public readonly List Subscriptions = new List(); - private IEnumerable underlyingEnumerable; + private IEnumerable _underlyingEnumerable; public MockEnumerable(TestScheduler scheduler, IEnumerable underlyingEnumerable) { Scheduler = scheduler ?? throw new ArgumentNullException(nameof(scheduler)); - this.underlyingEnumerable = underlyingEnumerable ?? throw new ArgumentNullException(nameof(underlyingEnumerable)); + this._underlyingEnumerable = underlyingEnumerable ?? throw new ArgumentNullException(nameof(underlyingEnumerable)); } public IEnumerator GetEnumerator() { - return new MockEnumerator(Scheduler, Subscriptions, underlyingEnumerable.GetEnumerator()); + return new MockEnumerator(Scheduler, Subscriptions, _underlyingEnumerable.GetEnumerator()); } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() @@ -32,19 +32,19 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() private class MockEnumerator : IEnumerator { - private readonly List subscriptions; - private IEnumerator enumerator; - private TestScheduler scheduler; - private readonly int index; - private bool disposed = false; + private readonly List _subscriptions; + private IEnumerator _enumerator; + private TestScheduler _scheduler; + private readonly int _index; + private bool _disposed; public MockEnumerator(TestScheduler scheduler, List subscriptions, IEnumerator enumerator) { - this.subscriptions = subscriptions; - this.enumerator = enumerator; - this.scheduler = scheduler; + this._subscriptions = subscriptions; + this._enumerator = enumerator; + this._scheduler = scheduler; - index = subscriptions.Count; + _index = subscriptions.Count; subscriptions.Add(new Subscription(scheduler.Clock)); } @@ -52,22 +52,22 @@ public T Current { get { - if (disposed) + if (_disposed) { throw new ObjectDisposedException("this"); } - return enumerator.Current; + return _enumerator.Current; } } public void Dispose() { - if (!disposed) + if (!_disposed) { - disposed = true; - enumerator.Dispose(); - subscriptions[index] = new Subscription(subscriptions[index].Subscribe, scheduler.Clock); + _disposed = true; + _enumerator.Dispose(); + _subscriptions[_index] = new Subscription(_subscriptions[_index].Subscribe, _scheduler.Clock); } } @@ -78,22 +78,22 @@ object System.Collections.IEnumerator.Current public bool MoveNext() { - if (disposed) + if (_disposed) { throw new ObjectDisposedException("this"); } - return enumerator.MoveNext(); + return _enumerator.MoveNext(); } public void Reset() { - if (disposed) + if (_disposed) { throw new ObjectDisposedException("this"); } - enumerator.Reset(); + _enumerator.Reset(); } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs index d5ec7a7843..61c068b7e3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs @@ -16,9 +16,9 @@ public class DefaultSchedulerTest [Fact] public void Schedule_ArgumentChecking() { - ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, default)); - ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, default)); + ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => DefaultScheduler.Instance.Schedule(42, TimeSpan.Zero, default)); ReactiveAssert.Throws(() => DefaultScheduler.Instance.SchedulePeriodic(42, TimeSpan.FromSeconds(1), default)); ReactiveAssert.Throws(() => DefaultScheduler.Instance.SchedulePeriodic(42, TimeSpan.FromSeconds(-1), _ => _)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs index 7dd497f207..24288732ea 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs @@ -27,9 +27,9 @@ public void EventLoop_ArgumentChecking() #if !NO_THREAD ReactiveAssert.Throws(() => new EventLoopScheduler(null)); #endif - ReactiveAssert.Throws(() => el.Schedule(42, default)); - ReactiveAssert.Throws(() => el.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => el.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => el.Schedule(42, default)); + ReactiveAssert.Throws(() => el.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => el.Schedule(42, TimeSpan.Zero, default)); ReactiveAssert.Throws(() => el.SchedulePeriodic(42, TimeSpan.FromSeconds(1), default)); ReactiveAssert.Throws(() => el.SchedulePeriodic(42, TimeSpan.FromSeconds(-1), _ => _)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs index 26b44c5e85..ca2121442f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs @@ -51,16 +51,16 @@ public void Immediate_ScheduleActionError() [Fact] public void Immediate_ArgumentChecking() { - ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, default)); - ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, default)); + ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => Scheduler.Immediate.Schedule(42, TimeSpan.Zero, default)); } [Fact] public void Immediate_Simple1() { var _x = 0; - Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return Disposable.Empty; }); + Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return Disposable.Empty; }); Assert.Equal(42, _x); } @@ -68,7 +68,7 @@ public void Immediate_Simple1() public void Immediate_Simple2() { var _x = 0; - Scheduler.Immediate.Schedule(42, DateTimeOffset.Now, (self, x) => { _x = x; return Disposable.Empty; }); + Scheduler.Immediate.Schedule(42, DateTimeOffset.Now, (self, x) => { _x = x; return Disposable.Empty; }); Assert.Equal(42, _x); } @@ -76,7 +76,7 @@ public void Immediate_Simple2() public void Immediate_Simple3() { var _x = 0; - Scheduler.Immediate.Schedule(42, TimeSpan.Zero, (self, x) => { _x = x; return Disposable.Empty; }); + Scheduler.Immediate.Schedule(42, TimeSpan.Zero, (self, x) => { _x = x; return Disposable.Empty; }); Assert.Equal(42, _x); } @@ -85,7 +85,7 @@ public void Immediate_Recursive1() { var _x = 0; var _y = 0; - Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, (self2, y) => { _y = y; return Disposable.Empty; }); }); + Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, (self2, y) => { _y = y; return Disposable.Empty; }); }); Assert.Equal(42, _x); Assert.Equal(43, _y); } @@ -95,7 +95,7 @@ public void Immediate_Recursive2() { var _x = 0; var _y = 0; - Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, DateTimeOffset.Now, (self2, y) => { _y = y; return Disposable.Empty; }); }); + Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, DateTimeOffset.Now, (self2, y) => { _y = y; return Disposable.Empty; }); }); Assert.Equal(42, _x); Assert.Equal(43, _y); } @@ -105,7 +105,7 @@ public void Immediate_Recursive3() { var _x = 0; var _y = 0; - Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, TimeSpan.FromMilliseconds(100), (self2, y) => { _y = y; return Disposable.Empty; }); }); + Scheduler.Immediate.Schedule(42, (self, x) => { _x = x; return self.Schedule(43, TimeSpan.FromMilliseconds(100), (self2, y) => { _y = y; return Disposable.Empty; }); }); Assert.Equal(42, _x); Assert.Equal(43, _y); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs index 181791b5ba..4bb17f078d 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs @@ -18,12 +18,12 @@ public class NewThreadSchedulerTest public void NewThread_ArgumentChecking() { ReactiveAssert.Throws(() => new NewThreadScheduler(null)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, default)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, TimeSpan.Zero, default)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(1), default)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.ScheduleLongRunning(42, default)); - ReactiveAssert.Throws(() => NewThreadScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(-1), _ => _)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, default)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(1), default)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.ScheduleLongRunning(42, default)); + ReactiveAssert.Throws(() => NewThreadScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(-1), _ => _)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs index 06748d9bb6..edd6e1d3da 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs @@ -264,13 +264,13 @@ public void Scheduler_Periodic_ArgumentChecking() ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, TimeSpan.FromSeconds(-1), () => { })); ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, TimeSpan.FromSeconds(1), default)); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(null, 42, TimeSpan.FromSeconds(1), _ => { })); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(-1), _ => { })); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(1), default(Action))); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(null, 42, TimeSpan.FromSeconds(1), _ => { })); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(-1), _ => { })); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(1), default(Action))); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(null, 42, TimeSpan.FromSeconds(1), _ => _)); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(-1), _ => _)); - ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(1), default)); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(null, 42, TimeSpan.FromSeconds(1), _ => _)); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(-1), _ => _)); + ReactiveAssert.Throws(() => Scheduler.SchedulePeriodic(ThreadPoolScheduler.Instance, 42, TimeSpan.FromSeconds(1), default)); } #endif diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs index c7cd3b2543..63839cb38e 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs @@ -23,9 +23,9 @@ public void SynchronizationContext_ArgumentChecking() ReactiveAssert.Throws(() => new SynchronizationContextScheduler(null)); ReactiveAssert.Throws(() => new SynchronizationContextScheduler(null, true)); - ReactiveAssert.Throws(() => s.Schedule(42, default)); - ReactiveAssert.Throws(() => s.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => s.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => s.Schedule(42, default)); + ReactiveAssert.Throws(() => s.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => s.Schedule(42, TimeSpan.Zero, default)); } [Fact] @@ -151,7 +151,7 @@ public void SynchronizationContext_StartedCompleted() var s = new SynchronizationContextScheduler(ms); var started = 0; - s.Schedule(42, TimeSpan.Zero, (self, x) => { started = ms.Started; return Disposable.Empty; }); + s.Schedule(42, TimeSpan.Zero, (self, x) => { started = ms.Started; return Disposable.Empty; }); Assert.True(started == 1); Assert.True(ms.Count == 1); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs index 21e172c916..bfff29cbe6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs @@ -17,9 +17,9 @@ public class TaskPoolSchedulerTest public void TaskPool_ArgumentChecking() { ReactiveAssert.Throws(() => new TaskPoolScheduler(null)); - ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, default)); - ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, default)); + ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => TaskPoolScheduler.Default.Schedule(42, TimeSpan.Zero, default)); ReactiveAssert.Throws(() => TaskPoolScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(1), default)); ReactiveAssert.Throws(() => TaskPoolScheduler.Default.SchedulePeriodic(42, TimeSpan.FromSeconds(-1), _ => _)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs index e0dc635727..dc25681d54 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Linq; using System.Reactive.Concurrency; -using System.Reactive.Disposables; using System.Threading; using Microsoft.Reactive.Testing; using Xunit; @@ -20,9 +19,9 @@ public class ThreadPoolSchedulerTest [Fact] public void Schedule_ArgumentChecking() { - ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, default)); - ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, DateTimeOffset.Now, default)); - ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, TimeSpan.Zero, default)); + ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, default)); + ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, DateTimeOffset.Now, default)); + ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.Schedule(42, TimeSpan.Zero, default)); } [Fact] @@ -144,7 +143,7 @@ public void ScheduleActionCancel() [Fact] public void ScheduleLongRunning_ArgumentChecking() { - ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.ScheduleLongRunning(42, default)); + ReactiveAssert.Throws(() => ThreadPoolScheduler.Instance.ScheduleLongRunning(42, default)); } [Fact] @@ -328,4 +327,4 @@ public void No_ThreadPool_Starvation_Dispose() #endif } } -#endif \ No newline at end of file +#endif diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ConnectableObservableTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ConnectableObservableTest.cs index 21b26944b0..b5bcdbad12 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ConnectableObservableTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ConnectableObservableTest.cs @@ -21,7 +21,7 @@ public void ConnectableObservable_Creation() var y = 0; var s2 = new Subject(); - var co2 = new ConnectableObservable(Observable.Return(1), s2); + var co2 = new ConnectableObservable(Observable.Return(1), s2); co2.Subscribe(x => y = x); Assert.NotEqual(1, y); @@ -35,7 +35,7 @@ public void ConnectableObservable_Connected() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -64,7 +64,7 @@ public void ConnectableObservable_NotConnected() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -87,7 +87,7 @@ public void ConnectableObservable_Disconnected() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -112,7 +112,7 @@ public void ConnectableObservable_DisconnectFuture() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -145,7 +145,7 @@ public void ConnectableObservable_MultipleNonOverlappedConnections() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs index 7811ec7a88..5cbd942449 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs @@ -4,7 +4,6 @@ #if !NO_REMOTING using System; -using System.IO; using System.Reactive.Concurrency; using System.Reactive.PlatformServices; using System.Runtime.CompilerServices; @@ -373,4 +372,4 @@ public override object InitializeLifetimeService() } } } -#endif \ No newline at end of file +#endif diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs index f55c7be6a4..1f2df3a0b1 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs @@ -49,7 +49,7 @@ public event EventHandler OnNext { add { - base.Add(value, GetInvoke(value)); + Add(value, GetInvoke(value)); } remove diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ImmutableListTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ImmutableListTest.cs index d1fdbfcbc1..ebcdcd6958 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ImmutableListTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ImmutableListTest.cs @@ -1,10 +1,12 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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. +#if SIGNED using System.Linq; using System.Reactive; using Xunit; +#endif namespace ReactiveTests.Tests { diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/ExceptionHelperTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/ExceptionHelperTest.cs index 4f77156261..bd49967ba0 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/ExceptionHelperTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/ExceptionHelperTest.cs @@ -11,50 +11,50 @@ namespace ReactiveTests.Tests public class ExceptionHelperTest { - private Exception errors; + private Exception _errors; [Fact] public void ExceptionHelper_TrySetException_Empty() { var ex = new InvalidOperationException(); - Assert.True(ExceptionHelper.TrySetException(ref errors, ex)); + Assert.True(ExceptionHelper.TrySetException(ref _errors, ex)); - Assert.Equal(ex, errors); + Assert.Equal(ex, _errors); } [Fact] public void ExceptionHelper_TrySetException_Not_Empty() { var ex1 = new InvalidOperationException(); - errors = ex1; + _errors = ex1; var ex2 = new NotSupportedException(); - Assert.False(ExceptionHelper.TrySetException(ref errors, ex2)); + Assert.False(ExceptionHelper.TrySetException(ref _errors, ex2)); - Assert.Equal(ex1, errors); + Assert.Equal(ex1, _errors); } [Fact] public void ExceptionHelper_TrySetException_Terminate_Empty() { - var ex = ExceptionHelper.Terminate(ref errors); + var ex = ExceptionHelper.Terminate(ref _errors); Assert.Null(ex); - Assert.Equal(errors, ExceptionHelper.Terminated); + Assert.Equal(_errors, ExceptionHelper.Terminated); } [Fact] public void ExceptionHelper_TrySetException_Terminate_Not_Empty() { var ex1 = new InvalidOperationException(); - errors = ex1; + _errors = ex1; - var ex = ExceptionHelper.Terminate(ref errors); + var ex = ExceptionHelper.Terminate(ref _errors); Assert.Equal(ex, ex1); - Assert.Equal(errors, ExceptionHelper.Terminated); + Assert.Equal(_errors, ExceptionHelper.Terminated); } @@ -62,17 +62,17 @@ public void ExceptionHelper_TrySetException_Terminate_Not_Empty() public void ExceptionHelper_TrySetException_Terminate_Twice() { var ex1 = new InvalidOperationException(); - errors = ex1; + _errors = ex1; - var ex = ExceptionHelper.Terminate(ref errors); + var ex = ExceptionHelper.Terminate(ref _errors); Assert.Equal(ex, ex1); - Assert.Equal(errors, ExceptionHelper.Terminated); + Assert.Equal(_errors, ExceptionHelper.Terminated); - ex = ExceptionHelper.Terminate(ref errors); + ex = ExceptionHelper.Terminate(ref _errors); Assert.Equal(ex, ExceptionHelper.Terminated); - Assert.Equal(errors, ExceptionHelper.Terminated); + Assert.Equal(_errors, ExceptionHelper.Terminated); } [Fact] @@ -80,23 +80,23 @@ public void ExceptionHelper_TryAddException_Empty() { var ex1 = new InvalidOperationException(); - Assert.True(ExceptionHelper.TryAddException(ref errors, ex1)); + Assert.True(ExceptionHelper.TryAddException(ref _errors, ex1)); - Assert.Equal(ex1, errors); + Assert.Equal(ex1, _errors); } [Fact] public void ExceptionHelper_TryAddException_Not_Empty() { var ex1 = new InvalidOperationException(); - errors = ex1; + _errors = ex1; var ex2 = new NotImplementedException(); - Assert.True(ExceptionHelper.TryAddException(ref errors, ex2)); + Assert.True(ExceptionHelper.TryAddException(ref _errors, ex2)); - Assert.True(errors is AggregateException); - var x = errors as AggregateException; + Assert.True(_errors is AggregateException); + var x = _errors as AggregateException; Assert.Equal(2, x.InnerExceptions.Count); Assert.True(x.InnerExceptions[0] is InvalidOperationException); @@ -109,14 +109,14 @@ public void ExceptionHelper_TryAddException_Aggregated() var ex1 = new InvalidOperationException(); var ex2 = new NotImplementedException(); - errors = new AggregateException(ex1, ex2); + _errors = new AggregateException(ex1, ex2); var ex3 = new InvalidCastException(); - Assert.True(ExceptionHelper.TryAddException(ref errors, ex3)); + Assert.True(ExceptionHelper.TryAddException(ref _errors, ex3)); - Assert.True(errors is AggregateException); - var x = errors as AggregateException; + Assert.True(_errors is AggregateException); + var x = _errors as AggregateException; Assert.Equal(3, x.InnerExceptions.Count); Assert.True(x.InnerExceptions[0] is InvalidOperationException); @@ -127,13 +127,13 @@ public void ExceptionHelper_TryAddException_Aggregated() [Fact] public void ExceptionHelper_TryAddException_Terminated() { - errors = ExceptionHelper.Terminated; + _errors = ExceptionHelper.Terminated; var ex = new InvalidCastException(); - Assert.False(ExceptionHelper.TryAddException(ref errors, ex)); + Assert.False(ExceptionHelper.TryAddException(ref _errors, ex)); - Assert.Equal(errors, ExceptionHelper.Terminated); + Assert.Equal(_errors, ExceptionHelper.Terminated); } } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/HalfSerializerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/HalfSerializerTest.cs index eb8d973660..fcb302fa3f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/HalfSerializerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Internal/HalfSerializerTest.cs @@ -11,22 +11,22 @@ namespace ReactiveTests.Tests { public class HalfSerializerTest { - private int wip; - private Exception error; - private Consumer consumer = new Consumer(); + private int _wip; + private Exception _error; + private Consumer _consumer = new Consumer(); [Fact] public void HalfSerializer_OnNext() { - HalfSerializer.ForwardOnNext(consumer, 1, ref wip, ref error); + HalfSerializer.ForwardOnNext(_consumer, 1, ref _wip, ref _error); - Assert.Equal(0, wip); - Assert.Null(error); + Assert.Equal(0, _wip); + Assert.Null(_error); - Assert.Equal(1, consumer.items.Count); - Assert.Equal(1, consumer.items[0]); - Assert.Equal(0, consumer.done); - Assert.Null(consumer.exc); + Assert.Equal(1, _consumer.Items.Count); + Assert.Equal(1, _consumer.Items[0]); + Assert.Equal(0, _consumer.Done); + Assert.Null(_consumer.Exc); } [Fact] @@ -34,16 +34,16 @@ public void HalfSerializer_OnError() { var ex = new InvalidOperationException(); - HalfSerializer.ForwardOnError(consumer, ex, ref wip, ref error); + HalfSerializer.ForwardOnError(_consumer, ex, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - HalfSerializer.ForwardOnNext(consumer, 2, ref wip, ref error); + HalfSerializer.ForwardOnNext(_consumer, 2, ref _wip, ref _error); - Assert.Equal(0, consumer.items.Count); - Assert.Equal(0, consumer.done); - Assert.Equal(ex, consumer.exc); + Assert.Equal(0, _consumer.Items.Count); + Assert.Equal(0, _consumer.Done); + Assert.Equal(ex, _consumer.Exc); } [Fact] @@ -51,52 +51,52 @@ public void HalfSerializer_OnError_Ignore_Further_Events() { var ex = new InvalidOperationException(); - HalfSerializer.ForwardOnError(consumer, ex, ref wip, ref error); + HalfSerializer.ForwardOnError(_consumer, ex, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - HalfSerializer.ForwardOnNext(consumer, 2, ref wip, ref error); + HalfSerializer.ForwardOnNext(_consumer, 2, ref _wip, ref _error); var ex2 = new NotSupportedException(); - HalfSerializer.ForwardOnError(consumer, ex2, ref wip, ref error); - HalfSerializer.ForwardOnCompleted(consumer, ref wip, ref error); + HalfSerializer.ForwardOnError(_consumer, ex2, ref _wip, ref _error); + HalfSerializer.ForwardOnCompleted(_consumer, ref _wip, ref _error); - Assert.Equal(0, consumer.items.Count); - Assert.Equal(0, consumer.done); - Assert.Equal(ex, consumer.exc); + Assert.Equal(0, _consumer.Items.Count); + Assert.Equal(0, _consumer.Done); + Assert.Equal(ex, _consumer.Exc); } [Fact] public void HalfSerializer_OnCompleted() { - HalfSerializer.ForwardOnCompleted(consumer, ref wip, ref error); + HalfSerializer.ForwardOnCompleted(_consumer, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - HalfSerializer.ForwardOnNext(consumer, 2, ref wip, ref error); + HalfSerializer.ForwardOnNext(_consumer, 2, ref _wip, ref _error); - Assert.Equal(0, consumer.items.Count); - Assert.Equal(1, consumer.done); - Assert.Null(consumer.exc); + Assert.Equal(0, _consumer.Items.Count); + Assert.Equal(1, _consumer.Done); + Assert.Null(_consumer.Exc); } [Fact] public void HalfSerializer_OnCompleted_Ignore_Further_Events() { - HalfSerializer.ForwardOnCompleted(consumer, ref wip, ref error); + HalfSerializer.ForwardOnCompleted(_consumer, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - HalfSerializer.ForwardOnNext(consumer, 2, ref wip, ref error); + HalfSerializer.ForwardOnNext(_consumer, 2, ref _wip, ref _error); var ex2 = new NotSupportedException(); - HalfSerializer.ForwardOnError(consumer, ex2, ref wip, ref error); - HalfSerializer.ForwardOnCompleted(consumer, ref wip, ref error); + HalfSerializer.ForwardOnError(_consumer, ex2, ref _wip, ref _error); + HalfSerializer.ForwardOnCompleted(_consumer, ref _wip, ref _error); - Assert.Equal(0, consumer.items.Count); - Assert.Equal(1, consumer.done); - Assert.Null(consumer.exc); + Assert.Equal(0, _consumer.Items.Count); + Assert.Equal(1, _consumer.Done); + Assert.Null(_consumer.Exc); } // Practically simulates concurrent invocation of the HalfSerializer methods @@ -105,15 +105,15 @@ public void HalfSerializer_OnNext_Reentrant_Error() { var c = new ReentrantConsumer(this, true); - HalfSerializer.ForwardOnNext(c, 1, ref wip, ref error); + HalfSerializer.ForwardOnNext(c, 1, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - Assert.Equal(1, consumer.items.Count); - Assert.Equal(1, consumer.items[0]); - Assert.Equal(0, consumer.done); - Assert.Equal(c.x, consumer.exc); + Assert.Equal(1, _consumer.Items.Count); + Assert.Equal(1, _consumer.Items[0]); + Assert.Equal(0, _consumer.Done); + Assert.Equal(c.X, _consumer.Exc); } // Practically simulates concurrent invocation of the HalfSerializer methods @@ -122,73 +122,73 @@ public void HalfSerializer_OnNext_Reentrant_OnCompleted() { var c = new ReentrantConsumer(this, false); - HalfSerializer.ForwardOnNext(c, 1, ref wip, ref error); + HalfSerializer.ForwardOnNext(c, 1, ref _wip, ref _error); - Assert.Equal(1, wip); - Assert.Equal(error, ExceptionHelper.Terminated); + Assert.Equal(1, _wip); + Assert.Equal(_error, ExceptionHelper.Terminated); - Assert.Equal(1, consumer.items.Count); - Assert.Equal(1, consumer.items[0]); - Assert.Equal(1, consumer.done); - Assert.Null(consumer.exc); + Assert.Equal(1, _consumer.Items.Count); + Assert.Equal(1, _consumer.Items[0]); + Assert.Equal(1, _consumer.Done); + Assert.Null(_consumer.Exc); } private sealed class Consumer : ISink { - internal List items = new List(); + internal List Items = new List(); - internal int done; - internal Exception exc; + internal int Done; + internal Exception Exc; public void ForwardOnCompleted() { - done++; + Done++; } public void ForwardOnError(Exception error) { - exc = error; + Exc = error; } public void ForwardOnNext(int value) { - items.Add(value); + Items.Add(value); } } private sealed class ReentrantConsumer : ISink { - private readonly HalfSerializerTest parent; - private readonly bool errorReenter; + private readonly HalfSerializerTest _parent; + private readonly bool _errorReenter; - internal readonly Exception x = new IndexOutOfRangeException(); + internal readonly Exception X = new IndexOutOfRangeException(); public ReentrantConsumer(HalfSerializerTest parent, bool errorReenter) { - this.parent = parent; - this.errorReenter = errorReenter; + this._parent = parent; + this._errorReenter = errorReenter; } public void ForwardOnCompleted() { - parent.consumer.ForwardOnCompleted(); + _parent._consumer.ForwardOnCompleted(); } public void ForwardOnError(Exception error) { - parent.consumer.ForwardOnError(error); + _parent._consumer.ForwardOnError(error); } public void ForwardOnNext(int value) { - parent.consumer.ForwardOnNext(value); - if (errorReenter) + _parent._consumer.ForwardOnNext(value); + if (_errorReenter) { - HalfSerializer.ForwardOnError(this, x, ref parent.wip, ref parent.error); + HalfSerializer.ForwardOnError(this, X, ref _parent._wip, ref _parent._error); } else { - HalfSerializer.ForwardOnCompleted(this, ref parent.wip, ref parent.error); + HalfSerializer.ForwardOnCompleted(this, ref _parent._wip, ref _parent._error); } } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/LicenseHeaderTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/LicenseHeaderTest.cs index 65d09c3e13..8ccac4124a 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/LicenseHeaderTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/LicenseHeaderTest.cs @@ -14,8 +14,8 @@ namespace Tests.System.Reactive.Tests /// public class LicenseHeaderTest { - private static readonly bool fixHeaders = true; - private static readonly string[] lines = { + private static readonly bool FixHeaders = true; + private static readonly string[] Lines = { "// 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.", @@ -64,17 +64,17 @@ private int ScanPath(string path, StringBuilder error) // analysis var content = File.ReadAllText(file); - if (!content.StartsWith(lines[0])) + if (!content.StartsWith(Lines[0])) { count++; error.Append(file).Append("\r\n"); - if (fixHeaders) + if (FixHeaders) { var newContent = new StringBuilder(); var separator = content.Contains("\r\n") ? "\r\n" : "\n"; - foreach (var s in lines) + foreach (var s in Lines) { newContent.Append(s).Append(separator); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AggregateTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AggregateTest.cs index aab2abf9de..69152664f6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AggregateTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AggregateTest.cs @@ -17,13 +17,13 @@ public class AggregateTest : ReactiveTest public void Aggregate_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.Aggregate(default, 1, (x, y) => x + y)); - ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, 1, default)); + ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, 1, default)); ReactiveAssert.Throws(() => Observable.Aggregate(default, (x, y) => x + y)); - ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, default)); + ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, default)); ReactiveAssert.Throws(() => Observable.Aggregate(default, 1, (x, y) => x + y, x => x)); - ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, 1, default, x => x)); + ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, 1, default, x => x)); ReactiveAssert.Throws(() => Observable.Aggregate(DummyObservable.Instance, 1, (x, y) => x + y, default)); } @@ -67,7 +67,7 @@ public void AggregateWithSeed_Return() ); res.Messages.AssertEqual( - OnNext(250, 42 + 24), + OnNext(250, 42 + 24), OnCompleted(250) ); @@ -225,7 +225,7 @@ public void AggregateWithSeedAndResult_Return() ); res.Messages.AssertEqual( - OnNext(250, (42 + 24) * 5), + OnNext(250, (42 + 24) * 5), OnCompleted(250) ); @@ -412,7 +412,7 @@ public void AggregateWithoutSeed_Return() ); res.Messages.AssertEqual( - OnNext(250, 24), + OnNext(250, 24), OnCompleted(250) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AndTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AndTest.cs index 6d5301344e..b6f8d5e5c6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AndTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AndTest.cs @@ -20,20 +20,20 @@ public void And_ArgumentChecking() ReactiveAssert.Throws(() => Observable.And(null, someObservable)); ReactiveAssert.Throws(() => Observable.And(someObservable, null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AverageTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AverageTest.cs index 1b17b24f5f..10fe89a31e 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AverageTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AverageTest.cs @@ -1415,7 +1415,7 @@ public void Average_Selector_Regular_Int32() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1439,7 +1439,7 @@ public void Average_Selector_Regular_Int64() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1463,7 +1463,7 @@ public void Average_Selector_Regular_Single() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1487,7 +1487,7 @@ public void Average_Selector_Regular_Double() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1511,7 +1511,7 @@ public void Average_Selector_Regular_Decimal() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1535,7 +1535,7 @@ public void Average_Selector_Regular_Int32_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1559,7 +1559,7 @@ public void Average_Selector_Regular_Int64_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1583,7 +1583,7 @@ public void Average_Selector_Regular_Single_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1607,7 +1607,7 @@ public void Average_Selector_Regular_Double_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), @@ -1631,7 +1631,7 @@ public void Average_Selector_Regular_Decimal_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "b"), OnNext(220, "fo"), OnNext(230, "qux"), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AwaitTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AwaitTest.cs index b222922e62..ba7ea0765d 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AwaitTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/AwaitTest.cs @@ -18,7 +18,7 @@ public class AwaitTest : ReactiveTest [Fact] public void Await_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.GetAwaiter(default(IObservable))); + ReactiveAssert.Throws(() => Observable.GetAwaiter(default(IObservable))); ReactiveAssert.Throws(() => Observable.GetAwaiter(default)); ReactiveAssert.Throws(() => Observable.GetAwaiter(Observable.Empty()).OnCompleted(null)); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CastTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CastTest.cs index 0efcd2847b..f688d275f1 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CastTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CastTest.cs @@ -26,7 +26,7 @@ public void Cast_Complete() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new D(1)), OnNext(240, new B(2)), @@ -39,9 +39,9 @@ public void Cast_Complete() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(220, new D(1)), - OnNext(240, new B(2)), + OnNext(240, new B(2)), OnNext(270, new D(3)), OnCompleted(300) ); @@ -58,7 +58,7 @@ public void Cast_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new D(1)), OnNext(240, new B(2)), @@ -71,9 +71,9 @@ public void Cast_Error() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(220, new D(1)), - OnNext(240, new B(2)), + OnNext(240, new B(2)), OnNext(270, new D(3)), OnError(300, ex) ); @@ -88,7 +88,7 @@ public void Cast_Dispose() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new D(1)), OnNext(240, new B(2)), @@ -102,9 +102,9 @@ public void Cast_Dispose() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(220, new D(1)), - OnNext(240, new B(2)) + OnNext(240, new B(2)) ); xs.Subscriptions.AssertEqual( @@ -117,7 +117,7 @@ public void Cast_NotValid() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new D(1)), OnNext(240, new B(2)), @@ -131,9 +131,9 @@ public void Cast_NotValid() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(220, new D(1)), - OnNext(240, new B(2)), + OnNext(240, new B(2)), OnError(250, e => e is InvalidCastException) ); @@ -149,7 +149,7 @@ internal class A : IEquatable public A(int id) { - this._id = id; + _id = id; } public bool Equals(A other) @@ -203,7 +203,7 @@ internal class E : IEquatable public E(int id) { - this._id = id; + _id = id; } public bool Equals(E other) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CatchTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CatchTest.cs index 4cc98019b4..6496c1b924 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CatchTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CatchTest.cs @@ -22,9 +22,9 @@ public class CatchTest : ReactiveTest public void Catch_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.Catch(null)); - ReactiveAssert.Throws(() => Observable.Catch((IEnumerable>)null)); - ReactiveAssert.Throws(() => Observable.Catch(DummyObservable.Instance, null)); - ReactiveAssert.Throws(() => Observable.Catch(null, DummyObservable.Instance)); + ReactiveAssert.Throws(() => Observable.Catch((IEnumerable>)null)); + ReactiveAssert.Throws(() => Observable.Catch(DummyObservable.Instance, null)); + ReactiveAssert.Throws(() => Observable.Catch(null, DummyObservable.Instance)); ReactiveAssert.Throws(() => Observable.Catch(null, _ => DummyObservable.Instance)); ReactiveAssert.Throws(() => Observable.Catch(DummyObservable.Instance, null)); } @@ -52,20 +52,20 @@ public void Catch_IEofIO() { var scheduler = new TestScheduler(); - var xs1 = scheduler.CreateColdObservable( + var xs1 = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), OnError(40, new Exception()) ); - var xs2 = scheduler.CreateColdObservable( + var xs2 = scheduler.CreateColdObservable( OnNext(10, 4), OnNext(20, 5), OnError(30, new Exception()) ); - var xs3 = scheduler.CreateColdObservable( + var xs3 = scheduler.CreateColdObservable( OnNext(10, 6), OnNext(20, 7), OnNext(30, 8), @@ -728,7 +728,7 @@ public void Catch_EmptyIterator() var scheduler = new TestScheduler(); var res = scheduler.Start(() => - Observable.Catch((IEnumerable>)new IObservable[0]) + Observable.Catch((IEnumerable>)new IObservable[0]) ); res.Messages.AssertEqual( @@ -743,7 +743,7 @@ public void Catch_IteratorThrows() var ex = new Exception(); var res = scheduler.Start(() => - Observable.Catch(Catch_IteratorThrows_Source(ex, true)) + Observable.Catch(Catch_IteratorThrows_Source(ex, true)) ); res.Messages.AssertEqual( @@ -928,7 +928,7 @@ public void Catch_TailRecursive1() var scheduler = new TestScheduler(); - var o = scheduler.CreateColdObservable( + var o = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CollectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CollectTest.cs index 0f39087cc2..23293fc5db 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CollectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CollectTest.cs @@ -181,7 +181,7 @@ public void Collect_SecondCollectorThrows() var ex = new Exception(); var n = 0; - var ys = xs.Collect(() => + var ys = xs.Collect(() => { if (n++ == 0) { @@ -232,7 +232,7 @@ public void Collect_NewCollectorThrows() ); var ex = new Exception(); - var ys = xs.Collect(() => 0, (x, y) => x + y, x => { throw ex; }); + var ys = xs.Collect(() => 0, (x, y) => x + y, x => { throw ex; }); var e = default(IEnumerator); var ex_ = default(Exception); @@ -273,7 +273,7 @@ public void Collect_MergeThrows() ); var ex = new Exception(); - var ys = xs.Collect(() => 0, (x, y) => { throw ex; }); + var ys = xs.Collect(() => 0, (x, y) => { throw ex; }); var e = default(IEnumerator); var ex_ = default(Exception); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CombineLatestTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CombineLatestTest.cs index 6a4e0f3894..c93cdb0b13 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CombineLatestTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CombineLatestTest.cs @@ -3702,7 +3702,7 @@ public void CombineLatest_List_Regular() var e2 = scheduler.CreateHotObservable(new[] { OnNext(150, 1), OnNext(230, 3), OnNext(260, 6), OnCompleted(290) }); var res = scheduler.Start(() => - Observable.CombineLatest(new IObservable[] { e0, e1, e2 }.AsEnumerable()) + Observable.CombineLatest(new IObservable[] { e0, e1, e2 }.AsEnumerable()) ); res.Messages.AssertEqual( @@ -3771,10 +3771,10 @@ public void CombineLatest_NAry_Symmetric_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), - OnNext(240, new[] { 1, 5, 3 }.Sum()), - OnNext(250, new[] { 4, 5, 3 }.Sum()), - OnNext(260, new[] { 4, 5, 6 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(240, new[] { 1, 5, 3 }.Sum()), + OnNext(250, new[] { 4, 5, 3 }.Sum()), + OnNext(260, new[] { 4, 5, 6 }.Sum()), OnCompleted(420) ); @@ -3842,13 +3842,13 @@ public void CombineLatest_NAry_Asymmetric_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), - OnNext(240, new[] { 1, 5, 3 }.Sum()), - OnNext(250, new[] { 4, 5, 3 }.Sum()), - OnNext(260, new[] { 4, 5, 6 }.Sum()), - OnNext(280, new[] { 4, 5, 8 }.Sum()), - OnNext(290, new[] { 4, 7, 8 }.Sum()), - OnNext(310, new[] { 4, 9, 8 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(240, new[] { 1, 5, 3 }.Sum()), + OnNext(250, new[] { 4, 5, 3 }.Sum()), + OnNext(260, new[] { 4, 5, 6 }.Sum()), + OnNext(280, new[] { 4, 5, 8 }.Sum()), + OnNext(290, new[] { 4, 7, 8 }.Sum()), + OnNext(310, new[] { 4, 9, 8 }.Sum()), OnCompleted(410) ); @@ -3915,8 +3915,8 @@ public void CombineLatest_NAry_Error_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), - OnNext(240, new[] { 1, 5, 3 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(240, new[] { 1, 5, 3 }.Sum()), OnError(250, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ConcatTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ConcatTest.cs index 795104e73e..a7bdb06c57 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ConcatTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ConcatTest.cs @@ -92,20 +92,20 @@ public void Concat_IEofIO() { var scheduler = new TestScheduler(); - var xs1 = scheduler.CreateColdObservable( + var xs1 = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), OnCompleted(40) ); - var xs2 = scheduler.CreateColdObservable( + var xs2 = scheduler.CreateColdObservable( OnNext(10, 4), OnNext(20, 5), OnCompleted(30) ); - var xs3 = scheduler.CreateColdObservable( + var xs3 = scheduler.CreateColdObservable( OnNext(10, 6), OnNext(20, 7), OnNext(30, 8), @@ -864,7 +864,7 @@ public void Concat_Optimization_DeferExceptionPropagation() var invoked = default(long); var xs = o1; - var ys = Observable.Defer(new Func>(() => { invoked = scheduler.Clock; throw ex; })); + var ys = Observable.Defer(new Func>(() => { invoked = scheduler.Clock; throw ex; })); var res = scheduler.Start(() => xs.Concat(ys) @@ -892,7 +892,7 @@ public void Concat_TailRecursive1() var scheduler = new TestScheduler(); - var o = scheduler.CreateColdObservable( + var o = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateAsyncTest.cs index 8bb1d2ac2a..cde3803bc4 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateAsyncTest.cs @@ -22,12 +22,12 @@ public class CreateAsyncTest : ReactiveTest [Fact] public void CreateAsync_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); - ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); - ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); - ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); - ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); - ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, Task>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, CancellationToken, Task>))); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateTest.cs index 8fa23c188e..c7d25ce851 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/CreateTest.cs @@ -21,7 +21,7 @@ public class CreateTest : ReactiveTest [Fact] public void Create_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Create(default(Func, Action>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, Action>))); // // BREAKING CHANGE v2.0 > v1.x - Returning null from Subscribe means "nothing to do upon unsubscription" @@ -121,7 +121,7 @@ public void Create_Error() public void Create_Exception() { ReactiveAssert.Throws(() => - Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Subscribe()); + Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Subscribe()); } [Fact] @@ -203,7 +203,7 @@ public void Create_ObserverThrows() [Fact] public void CreateWithDisposable_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Create(default(Func, IDisposable>))); + ReactiveAssert.Throws(() => Observable.Create(default(Func, IDisposable>))); ReactiveAssert.Throws(() => Observable.Create(o => DummyDisposable.Instance).Subscribe(null)); ReactiveAssert.Throws(() => Observable.Create(o => { @@ -296,7 +296,7 @@ public void CreateWithDisposable_Error() public void CreateWithDisposable_Exception() { ReactiveAssert.Throws(() => - Observable.Create(new Func, IDisposable>(o => { throw new InvalidOperationException(); })).Subscribe()); + Observable.Create(new Func, IDisposable>(o => { throw new InvalidOperationException(); })).Subscribe()); } [Fact] @@ -379,20 +379,20 @@ public void CreateWithDisposable_ObserverThrows() public void Iterate_ArgumentChecking() { ReactiveAssert.Throws(() => ObservableEx.Create(default)); - ReactiveAssert.Throws(() => ObservableEx.Create(DummyFunc, IEnumerable>>.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ObservableEx.Create(DummyFunc, IEnumerable>>.Instance).Subscribe(null)); } - private IEnumerable> ToIterate_Complete(IObservable xs, IObservable ys, IObservable zs, IObserver observer) + private IEnumerable> ToIterate_Complete(IObservable xs, IObservable ys, IObservable zs, IObserver observer) { observer.OnNext(1); - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); observer.OnNext(2); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); observer.OnNext(3); observer.OnCompleted(); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); observer.OnNext(4); } @@ -447,16 +447,16 @@ public void Iterate_Complete() ); } - private IEnumerable> ToIterate_Complete_Implicit(IObservable xs, IObservable ys, IObservable zs, IObserver observer) + private IEnumerable> ToIterate_Complete_Implicit(IObservable xs, IObservable ys, IObservable zs, IObserver observer) { observer.OnNext(1); - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); observer.OnNext(2); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); observer.OnNext(3); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); observer.OnNext(4); } @@ -512,13 +512,13 @@ public void Iterate_Complete_Implicit() ); } - private IEnumerable> ToIterate_Throw(IObservable xs, IObservable ys, IObservable zs, IObserver observer, Exception ex) + private IEnumerable> ToIterate_Throw(IObservable xs, IObservable ys, IObservable zs, IObserver observer, Exception ex) { observer.OnNext(1); - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); observer.OnNext(2); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); observer.OnNext(3); @@ -527,7 +527,7 @@ private IEnumerable> ToIterate_Throw(IObservable xs, IO throw ex; } - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); observer.OnNext(4); observer.OnCompleted(); @@ -584,19 +584,19 @@ public void Iterate_Iterator_Throw() ); } - private IEnumerable> ToIterate_Error(IObservable xs, IObservable ys, IObservable zs, IObserver observer, Exception ex) + private IEnumerable> ToIterate_Error(IObservable xs, IObservable ys, IObservable zs, IObserver observer, Exception ex) { observer.OnNext(1); - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); observer.OnNext(2); observer.OnError(ex); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); observer.OnNext(3); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); observer.OnNext(4); observer.OnCompleted(); @@ -652,16 +652,16 @@ public void Iterate_Iterator_Error() ); } - private IEnumerable> ToIterate_Complete_Dispose(IObservable xs, IObservable ys, IObservable zs, IObserver observer) + private IEnumerable> ToIterate_Complete_Dispose(IObservable xs, IObservable ys, IObservable zs, IObserver observer) { observer.OnNext(1); - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); observer.OnNext(2); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); observer.OnNext(3); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); observer.OnNext(4); } @@ -727,7 +727,7 @@ public void IteratorScenario() xs.AssertEqual(new[] { 100, 1000 }.ToObservable()); } - private static IEnumerable> _IteratorScenario(int x, int y, IObserver results) + private static IEnumerable> _IteratorScenario(int x, int y, IObserver results) { var xs = Observable.Range(1, x).ToListObservable(); yield return xs; @@ -744,16 +744,16 @@ private static IEnumerable> _IteratorScenario(int x, int y, public void Iterate_Void_ArgumentChecking() { ReactiveAssert.Throws(() => ObservableEx.Create(default)); - ReactiveAssert.Throws(() => ObservableEx.Create(DummyFunc>>.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ObservableEx.Create(DummyFunc>>.Instance).Subscribe(null)); } - private IEnumerable> ToIterate_Void_Complete(IObservable xs, IObservable ys, IObservable zs) + private IEnumerable> ToIterate_Void_Complete(IObservable xs, IObservable ys, IObservable zs) { - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); } [Fact] @@ -803,13 +803,13 @@ public void Iterate_Void_Complete() ); } - private IEnumerable> ToIterate_Void_Complete_Implicit(IObservable xs, IObservable ys, IObservable zs) + private IEnumerable> ToIterate_Void_Complete_Implicit(IObservable xs, IObservable ys, IObservable zs) { - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); } [Fact] @@ -859,18 +859,18 @@ public void Iterate_Void_Complete_Implicit() ); } - private IEnumerable> ToIterate_Void_Throw(IObservable xs, IObservable ys, IObservable zs, Exception ex) + private IEnumerable> ToIterate_Void_Throw(IObservable xs, IObservable ys, IObservable zs, Exception ex) { - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); if (xs != null) { throw ex; } - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); } [Fact] @@ -921,13 +921,13 @@ public void Iterate_Void_Iterator_Throw() ); } - private IEnumerable> ToIterate_Void_Complete_Dispose(IObservable xs, IObservable ys, IObservable zs) + private IEnumerable> ToIterate_Void_Complete_Dispose(IObservable xs, IObservable ys, IObservable zs) { - yield return xs.Select(x => new Object()); + yield return xs.Select(x => new object()); - yield return ys.Select(x => new Object()); + yield return ys.Select(x => new object()); - yield return zs.Select(x => new Object()); + yield return zs.Select(x => new object()); } [Fact] @@ -994,7 +994,7 @@ public void Iterate_Void_Func_Throw() Assert.IsType(notification.Exception); } - private static IEnumerable> _IteratorScenario_Void(int x, int y) + private static IEnumerable> _IteratorScenario_Void(int x, int y) { var xs = Observable.Range(1, x).ToListObservable(); yield return xs; diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferAsyncTest.cs index d5702592bb..25745532c6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferAsyncTest.cs @@ -25,7 +25,7 @@ public void DeferAsync_ArgumentChecking() [Fact] public void DeferAsync_Simple() { - var xs = Observable.Defer(() => Task.Factory.StartNew(() => Observable.Return(42))); + var xs = Observable.Defer(() => Task.Factory.StartNew(() => Observable.Return(42))); var res = xs.ToEnumerable().ToList(); @@ -35,7 +35,7 @@ public void DeferAsync_Simple() [Fact] public void DeferAsync_WithCancel_Simple() { - var xs = Observable.DeferAsync(ct => Task.Factory.StartNew(() => Observable.Return(42))); + var xs = Observable.DeferAsync(ct => Task.Factory.StartNew(() => Observable.Return(42))); var res = xs.ToEnumerable().ToList(); @@ -51,7 +51,7 @@ public void DeferAsync_WithCancel_Cancel() var e = new ManualResetEvent(false); var called = false; - var xs = Observable.DeferAsync(ct => Task.Factory.StartNew(() => + var xs = Observable.DeferAsync(ct => Task.Factory.StartNew(() => { e.Set(); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferTest.cs index acd9619a95..bf29522dfe 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DeferTest.cs @@ -16,9 +16,9 @@ public class DeferTest : ReactiveTest [Fact] public void Defer_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Defer(default(Func>))); + ReactiveAssert.Throws(() => Observable.Defer(default(Func>))); ReactiveAssert.Throws(() => Observable.Defer(() => DummyObservable.Instance).Subscribe(null)); - ReactiveAssert.Throws(() => Observable.Defer(() => default(IObservable)).Subscribe()); + ReactiveAssert.Throws(() => Observable.Defer(() => default(IObservable)).Subscribe()); } [Fact] @@ -34,7 +34,7 @@ public void Defer_Complete() { invoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), + OnNext(100, scheduler.Clock), OnCompleted(200)); return xs; }) @@ -66,7 +66,7 @@ public void Defer_Error() { invoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), + OnNext(100, scheduler.Clock), OnError(200, ex)); return xs; }) @@ -97,7 +97,7 @@ public void Defer_Dispose() { invoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), + OnNext(100, scheduler.Clock), OnNext(200, invoked), OnNext(1100, 1000)); return xs; @@ -125,7 +125,7 @@ public void Defer_Throw() var ex = new Exception(); var res = scheduler.Start(() => - Observable.Defer(new Func>(() => + Observable.Defer(new Func>(() => { invoked++; throw ex; diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DelayTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DelayTest.cs index 79f97a0509..fa9a6f8efc 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DelayTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DelayTest.cs @@ -1191,7 +1191,7 @@ public void Delay_Duration_SelectorThrows1() ); var ys = scheduler.CreateColdObservable( - OnNext(80, "") + OnNext(80, "") ); var res = scheduler.Start(() => @@ -1244,9 +1244,9 @@ public void Delay_Duration_Simple() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), - OnNext(450 + 4 * 10, 4), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), + OnNext(450 + 4 * 10, 4), OnCompleted(550) ); @@ -1278,9 +1278,9 @@ public void Delay_Duration_DeferOnCompleted() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), - OnNext(450 + 4 * 10, 4), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), + OnNext(450 + 4 * 10, 4), OnCompleted(450 + 4 * 10) ); @@ -1317,8 +1317,8 @@ public void Delay_Duration_InnerError() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(450 + 4 * 10, ex) ); @@ -1352,8 +1352,8 @@ public void Delay_Duration_OuterError() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(460, ex) ); @@ -1395,8 +1395,8 @@ public void Delay_Duration_SelectorThrows2() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(450, ex) ); @@ -1429,9 +1429,9 @@ public void Delay_Duration_InnerDone() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), - OnNext(450 + 4 * 10, 4), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), + OnNext(450 + 4 * 10, 4), OnCompleted(550) ); @@ -1473,9 +1473,9 @@ public void Delay_Duration_InnerSubscriptionTimes() ); res.Messages.AssertEqual( - OnNext(250 + 20, 0), - OnNext(350 + 10, 1), - OnNext(450 + 30, 2), + OnNext(250 + 20, 0), + OnNext(350 + 10, 1), + OnNext(450 + 30, 2), OnCompleted(550) ); @@ -1584,7 +1584,7 @@ public void Delay_DurationAndSubscription_Dispose1() ); var ys = scheduler.CreateColdObservable( - OnNext(10, "!") + OnNext(10, "!") ); var res = scheduler.Start(() => @@ -1621,7 +1621,7 @@ public void Delay_DurationAndSubscription_Dispose2() ); var ys = scheduler.CreateColdObservable( - OnNext(100, "!") + OnNext(100, "!") ); var res = scheduler.Start(() => diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DistinctUntilChangedTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DistinctUntilChangedTest.cs index 2dcb553df8..c190fbcefc 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DistinctUntilChangedTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DistinctUntilChangedTest.cs @@ -19,13 +19,13 @@ public void DistinctUntilChanged_ArgumentChecking() var someObservable = Observable.Empty(); ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(null)); - ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(null, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, null)); + ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(null, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, null)); ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(null, _ => _)); ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, null)); - ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, _ => _, null)); + ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, _ => _, null)); ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(null, _ => _, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, null, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.DistinctUntilChanged(someObservable, null, EqualityComparer.Default)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DoTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DoTest.cs index f94ea83e51..5d0ef6db68 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DoTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/DoTest.cs @@ -18,20 +18,20 @@ public void Do_ArgumentChecking() { var someObservable = Observable.Empty(); - ReactiveAssert.Throws(() => Observable.Do(someObservable, (Action)null)); + ReactiveAssert.Throws(() => Observable.Do(someObservable, (Action)null)); ReactiveAssert.Throws(() => Observable.Do(null, _ => { })); - ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Action)null)); - ReactiveAssert.Throws(() => Observable.Do(someObservable, null, () => { })); + ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Action)null)); + ReactiveAssert.Throws(() => Observable.Do(someObservable, null, () => { })); ReactiveAssert.Throws(() => Observable.Do(null, x => { }, () => { })); - ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Action)null)); - ReactiveAssert.Throws(() => Observable.Do(someObservable, null, (Exception _) => { })); + ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Action)null)); + ReactiveAssert.Throws(() => Observable.Do(someObservable, null, (Exception _) => { })); ReactiveAssert.Throws(() => Observable.Do(null, x => { }, (Exception _) => { })); - ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Exception _) => { }, null)); - ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, null, () => { })); - ReactiveAssert.Throws(() => Observable.Do(someObservable, null, (Exception _) => { }, () => { })); + ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, (Exception _) => { }, null)); + ReactiveAssert.Throws(() => Observable.Do(someObservable, x => { }, null, () => { })); + ReactiveAssert.Throws(() => Observable.Do(someObservable, null, (Exception _) => { }, () => { })); ReactiveAssert.Throws(() => Observable.Do(null, x => { }, (Exception _) => { }, () => { })); - ReactiveAssert.Throws(() => Observable.Do(null, Observer.Create(i => { }))); - ReactiveAssert.Throws(() => Observable.Do(someObservable, default(IObserver))); + ReactiveAssert.Throws(() => Observable.Do(null, Observer.Create(i => { }))); + ReactiveAssert.Throws(() => Observable.Do(someObservable, default(IObserver))); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/EmptyTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/EmptyTest.cs index 0812788756..129540b87d 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/EmptyTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/EmptyTest.cs @@ -19,7 +19,7 @@ public class EmptyTest : ReactiveTest public void Empty_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.Empty(null)); - ReactiveAssert.Throws(() => Observable.Empty(null, 42)); + ReactiveAssert.Throws(() => Observable.Empty(null, 42)); ReactiveAssert.Throws(() => Observable.Empty(DummyScheduler.Instance).Subscribe(null)); } @@ -75,7 +75,7 @@ public void Empty_Basic_Witness1() var scheduler = new TestScheduler(); var res = scheduler.Start(() => - Observable.Empty(scheduler, 42) + Observable.Empty(scheduler, 42) ); res.Messages.AssertEqual( @@ -88,7 +88,7 @@ public void Empty_Basic_Witness2() { var e = new ManualResetEvent(false); - Observable.Empty(42).Subscribe( + Observable.Empty(42).Subscribe( _ => { Assert.True(false); }, _ => { Assert.True(false); }, () => e.Set() diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ExpandTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ExpandTest.cs index 7dcb4ed54b..e9c10d893d 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ExpandTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ExpandTest.cs @@ -71,7 +71,7 @@ public void Expand_Error() ); var res = scheduler.Start(() => - xs.Expand(x => scheduler.CreateColdObservable( + xs.Expand(x => scheduler.CreateColdObservable( OnNext(100 + x, 2 * x), OnNext(200 + x, 3 * x), OnCompleted(300 + x) @@ -96,7 +96,7 @@ public void Expand_Never() ); var res = scheduler.Start(() => - xs.Expand(x => scheduler.CreateColdObservable( + xs.Expand(x => scheduler.CreateColdObservable( OnNext(100 + x, 2 * x), OnNext(200 + x, 3 * x), OnCompleted(300 + x) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FinallyTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FinallyTest.cs index b4e9beff34..9c662938a2 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FinallyTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FinallyTest.cs @@ -18,7 +18,7 @@ public void Finally_ArgumentChecking() var someObservable = Observable.Empty(); ReactiveAssert.Throws(() => Observable.Finally(null, () => { })); - ReactiveAssert.Throws(() => Observable.Finally(someObservable, null)); + ReactiveAssert.Throws(() => Observable.Finally(someObservable, null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstOrDefaultTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstOrDefaultTest.cs index c650d82c88..9a937142ae 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstOrDefaultTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstOrDefaultTest.cs @@ -41,7 +41,7 @@ public void FirstOrDefaultPredicate_Empty() public void FirstOrDefault_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).FirstOrDefault()); + Assert.Equal(value, Observable.Return(value).FirstOrDefault()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstTest.cs index e9d193cf02..0fa08ecbb7 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FirstTest.cs @@ -38,21 +38,21 @@ public void FirstPredicate_Empty() public void First_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).First()); + Assert.Equal(value, Observable.Return(value).First()); } [Fact] public void FirstPredicate_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).First(i => i % 2 == 0)); + Assert.Equal(value, Observable.Return(value).First(i => i % 2 == 0)); } [Fact] public void FirstPredicate_Return_NoMatch() { var value = 42; - ReactiveAssert.Throws(() => Observable.Return(value).First(i => i % 2 != 0)); + ReactiveAssert.Throws(() => Observable.Return(value).First(i => i % 2 != 0)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForTest.cs index 8983f4cedb..623d26be3f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForTest.cs @@ -27,9 +27,9 @@ public void For_Basic() var scheduler = new TestScheduler(); var results = scheduler.Start(() => Observable.For(new[] { 1, 2, 3 }, x => scheduler.CreateColdObservable( - OnNext((ushort)(x * 100 + 10), x * 10 + 1), - OnNext((ushort)(x * 100 + 20), x * 10 + 2), - OnNext((ushort)(x * 100 + 30), x * 10 + 3), + OnNext((ushort)(x * 100 + 10), x * 10 + 1), + OnNext((ushort)(x * 100 + 20), x * 10 + 2), + OnNext((ushort)(x * 100 + 30), x * 10 + 3), OnCompleted((ushort)(x * 100 + 40))))); results.Messages.AssertEqual( @@ -62,9 +62,9 @@ public void For_Error_Iterator() var ex = new Exception(); var results = scheduler.Start(() => Observable.For(For_Error_Core(ex), x => scheduler.CreateColdObservable( - OnNext((ushort)(x * 100 + 10), x * 10 + 1), - OnNext((ushort)(x * 100 + 20), x * 10 + 2), - OnNext((ushort)(x * 100 + 30), x * 10 + 3), + OnNext((ushort)(x * 100 + 10), x * 10 + 1), + OnNext((ushort)(x * 100 + 20), x * 10 + 2), + OnNext((ushort)(x * 100 + 30), x * 10 + 3), OnCompleted((ushort)(x * 100 + 40))))); results.Messages.AssertEqual( diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForkJoinTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForkJoinTest.cs index d900c2f3f5..c5c5402d1c 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForkJoinTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ForkJoinTest.cs @@ -582,7 +582,7 @@ public void Bug_1302_RightLast_NoLeft() OnCompleted(220) ); - var results = scheduler.Start(() => xs.ForkJoin(ys, (x, y) => x + y)); + var results = scheduler.Start(() => xs.ForkJoin(ys, (x, y) => x + y)); results.Messages.AssertEqual( OnCompleted(220) @@ -611,7 +611,7 @@ public void Bug_1302_RightLast_NoRight() OnCompleted(220) ); - var results = scheduler.Start(() => xs.ForkJoin(ys, (x, y) => x + y)); + var results = scheduler.Start(() => xs.ForkJoin(ys, (x, y) => x + y)); results.Messages.AssertEqual( OnCompleted(220) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncPatternTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncPatternTest.cs index 9a4e717ecc..22839a7d20 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncPatternTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncPatternTest.cs @@ -28,7 +28,7 @@ public FromAsyncPatternTest() public void FromAsyncPattern_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => { })); - ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => 0)); + ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => 0)); ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => { })); ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => 0)); ReactiveAssert.Throws(() => Observable.FromAsyncPattern(null, iar => { })); @@ -99,7 +99,7 @@ public void FromAsyncPattern0() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)().Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -154,7 +154,7 @@ public void FromAsyncPattern1() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -215,7 +215,7 @@ public void FromAsyncPattern2() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -278,7 +278,7 @@ public void FromAsyncPattern3() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] public void FromAsyncPatternAction3() @@ -342,7 +342,7 @@ public void FromAsyncPattern4() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -409,7 +409,7 @@ public void FromAsyncPattern5() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -478,7 +478,7 @@ public void FromAsyncPattern6() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -549,7 +549,7 @@ public void FromAsyncPattern7() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -622,7 +622,7 @@ public void FromAsyncPattern8() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -697,7 +697,7 @@ public void FromAsyncPattern9() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -774,7 +774,7 @@ public void FromAsyncPattern10() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10, 11).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -853,7 +853,7 @@ public void FromAsyncPattern11() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -934,7 +934,7 @@ public void FromAsyncPattern12() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -1017,7 +1017,7 @@ public void FromAsyncPattern13() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] @@ -1102,7 +1102,7 @@ public void FromAsyncPattern14() Func end = iar => { Assert.Same(x, iar); return 1; }; var res = Observable.FromAsyncPattern(begin, end)(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15).Materialize().ToEnumerable().ToArray(); - Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); + Assert.True(res.SequenceEqual(new Notification[] { Notification.CreateOnNext(1), Notification.CreateOnCompleted() })); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncTest.cs index 7ab97e08a7..b2cc9257b4 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromAsyncTest.cs @@ -32,13 +32,13 @@ public void FromAsync_Func_ArgumentChecking() { var s = Scheduler.Immediate; - ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>))); - ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>))); + ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>))); + ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>))); - ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>), s)); - ReactiveAssert.Throws(() => Observable.FromAsync(() => _doneTask, default)); - ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>), s)); - ReactiveAssert.Throws(() => Observable.FromAsync(ct => _doneTask, default)); + ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>), s)); + ReactiveAssert.Throws(() => Observable.FromAsync(() => _doneTask, default)); + ReactiveAssert.Throws(() => Observable.FromAsync(default(Func>), s)); + ReactiveAssert.Throws(() => Observable.FromAsync(ct => _doneTask, default)); } [Fact] @@ -78,7 +78,7 @@ public void FromAsync_Func_Throw_Asynchronous() { var ex = new Exception(); - var xs = Observable.FromAsync(() => + var xs = Observable.FromAsync(() => Task.Factory.StartNew(() => { throw ex; }) ); @@ -122,7 +122,7 @@ public void FromAsync_FuncWithCancel_Throw_Asynchronous() { var ex = new Exception(); - var xs = Observable.FromAsync(ct => + var xs = Observable.FromAsync(ct => Task.Factory.StartNew(() => { throw ex; }) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventPatternTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventPatternTest.cs index 95c7d50aad..7db6080eed 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventPatternTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventPatternTest.cs @@ -832,7 +832,7 @@ public event TestEventHandler RemoveThrows public event EventHandler E5; public void M5(int i) { - E5?.Invoke(this, new FromEventPattern.TestEventArgs { Id = i }); + E5?.Invoke(this, new TestEventArgs { Id = i }); } public static event EventHandler E6; @@ -944,8 +944,8 @@ internal class MyEventSyncCtx : SynchronizationContext public override void Post(SendOrPostCallback d, object state) { - var old = SynchronizationContext.Current; - SynchronizationContext.SetSynchronizationContext(this); + var old = Current; + SetSynchronizationContext(this); try { PostCount++; @@ -953,7 +953,7 @@ public override void Post(SendOrPostCallback d, object state) } finally { - SynchronizationContext.SetSynchronizationContext(old); + SetSynchronizationContext(old); } } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventTest.cs index eb1fc3d73e..a394b3f073 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/FromEventTest.cs @@ -283,7 +283,7 @@ public void FromEvent_SynchronizationContext() addEvt.WaitOne(); - subscribeOnCtx = object.ReferenceEquals(addCtx, ctx); + subscribeOnCtx = ReferenceEquals(addCtx, ctx); src.OnBar(42); fstNext = res.SequenceEqual(new[] { 42 }); @@ -303,7 +303,7 @@ public void FromEvent_SynchronizationContext() remEvt.WaitOne(); - disposeOnCtx = object.ReferenceEquals(remCtx, ctx); + disposeOnCtx = ReferenceEquals(remCtx, ctx); src.OnBar(44); thdNext = res.SequenceEqual(new[] { 42, 43 }); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GetEnumeratorTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GetEnumeratorTest.cs index 23d36c2fb8..7c0150ca43 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GetEnumeratorTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GetEnumeratorTest.cs @@ -27,7 +27,7 @@ public void GetEnumerator_Regular1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateColdObservable( + var xs = scheduler.CreateColdObservable( OnNext(10, 2), OnNext(20, 3), OnNext(30, 5), @@ -79,7 +79,7 @@ public void GetEnumerator_Regular2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateColdObservable( + var xs = scheduler.CreateColdObservable( OnNext(10, 2), OnNext(30, 3), OnNext(50, 5), @@ -131,7 +131,7 @@ public void GetEnumerator_Dispose() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateColdObservable( + var xs = scheduler.CreateColdObservable( OnNext(10, 2), OnNext(30, 3), OnNext(50, 5), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GroupByTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GroupByTest.cs index a778ab69c9..ae084f7ed3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GroupByTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/GroupByTest.cs @@ -3480,18 +3480,18 @@ public void GroupBy_Capacity_NullKeys_Error() internal class GroupByComparer : IEqualityComparer { - private TestScheduler scheduler; - private readonly int equalsThrowsAfter; - private readonly ushort getHashCodeThrowsAfter; + private TestScheduler _scheduler; + private readonly int _equalsThrowsAfter; + private readonly ushort _getHashCodeThrowsAfter; public Exception HashCodeException = new Exception(); public Exception EqualsException = new Exception(); public GroupByComparer(TestScheduler scheduler, ushort equalsThrowsAfter, ushort getHashCodeThrowsAfter) { - this.scheduler = scheduler; - this.equalsThrowsAfter = equalsThrowsAfter; - this.getHashCodeThrowsAfter = getHashCodeThrowsAfter; + this._scheduler = scheduler; + this._equalsThrowsAfter = equalsThrowsAfter; + this._getHashCodeThrowsAfter = getHashCodeThrowsAfter; } public GroupByComparer(TestScheduler scheduler) @@ -3501,7 +3501,7 @@ public GroupByComparer(TestScheduler scheduler) public bool Equals(string x, string y) { - if (scheduler.Clock > equalsThrowsAfter) + if (_scheduler.Clock > _equalsThrowsAfter) { throw EqualsException; } @@ -3511,7 +3511,7 @@ public bool Equals(string x, string y) public int GetHashCode(string obj) { - if (scheduler.Clock > getHashCodeThrowsAfter) + if (_scheduler.Clock > _getHashCodeThrowsAfter) { throw HashCodeException; } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/IfTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/IfTest.cs index d8f626f892..a5abf431b3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/IfTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/IfTest.cs @@ -157,7 +157,7 @@ public void If_Dispose() [Fact] public void If_Default_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.If(null, DummyObservable.Instance)); + ReactiveAssert.Throws(() => Observable.If(null, DummyObservable.Instance)); ReactiveAssert.Throws(() => Observable.If(DummyFunc.Instance, null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastOrDefaultTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastOrDefaultTest.cs index 8e4ebaa4c4..b6173a5a72 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastOrDefaultTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastOrDefaultTest.cs @@ -38,7 +38,7 @@ public void LastOrDefaultPredicate_Empty() public void LastOrDefault_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).LastOrDefault()); + Assert.Equal(value, Observable.Return(value).LastOrDefault()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastTest.cs index e07740b7fa..7ed695f965 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LastTest.cs @@ -38,7 +38,7 @@ public void LastPredicate_Empty() public void Last_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).Last()); + Assert.Equal(value, Observable.Return(value).Last()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LatestTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LatestTest.cs index fe69d6e965..4206a86c1e 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LatestTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/LatestTest.cs @@ -73,7 +73,7 @@ public void Latest2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ManySelectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ManySelectTest.cs index 91965a0f2a..de7ba68dd1 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ManySelectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ManySelectTest.cs @@ -18,10 +18,10 @@ public class ManySelectTest : ReactiveTest [Fact] public void ManySelect_ArgumentChecking() { - ReactiveAssert.Throws(() => ObservableEx.ManySelect(null, DummyFunc, int>.Instance, DummyScheduler.Instance)); + ReactiveAssert.Throws(() => ObservableEx.ManySelect(null, DummyFunc, int>.Instance, DummyScheduler.Instance)); ReactiveAssert.Throws(() => ObservableEx.ManySelect(DummyObservable.Instance, null, DummyScheduler.Instance)); - ReactiveAssert.Throws(() => ObservableEx.ManySelect(DummyObservable.Instance, DummyFunc, int>.Instance, null)); - ReactiveAssert.Throws(() => ObservableEx.ManySelect(null, DummyFunc, int>.Instance)); + ReactiveAssert.Throws(() => ObservableEx.ManySelect(DummyObservable.Instance, DummyFunc, int>.Instance, null)); + ReactiveAssert.Throws(() => ObservableEx.ManySelect(null, DummyFunc, int>.Instance)); ReactiveAssert.Throws(() => ObservableEx.ManySelect(DummyObservable.Instance, null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MaxTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MaxTest.cs index 4e482ee370..2b77bf15f4 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MaxTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MaxTest.cs @@ -2105,7 +2105,7 @@ public void Max_Selector_Regular_Int32() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2129,7 +2129,7 @@ public void Max_Selector_Regular_Int64() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2153,7 +2153,7 @@ public void Max_Selector_Regular_Single() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2177,7 +2177,7 @@ public void Max_Selector_Regular_Double() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2201,7 +2201,7 @@ public void Max_Selector_Regular_Decimal() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2225,7 +2225,7 @@ public void Max_Selector_Regular_Int32_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2249,7 +2249,7 @@ public void Max_Selector_Regular_Int64_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2273,7 +2273,7 @@ public void Max_Selector_Regular_Single_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2297,7 +2297,7 @@ public void Max_Selector_Regular_Double_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2321,7 +2321,7 @@ public void Max_Selector_Regular_Decimal_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2345,7 +2345,7 @@ public void MaxOfT_Selector_Regular() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "bar"), OnNext(220, "qux"), OnNext(230, "foo"), @@ -2369,7 +2369,7 @@ public void MaxOfT_Selector_Regular_Comparer() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "bar"), OnNext(220, "qux"), OnNext(230, "foo"), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MergeTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MergeTest.cs index 2eb560ce46..a0e018cba7 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MergeTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MergeTest.cs @@ -43,7 +43,7 @@ public void Merge_ArgumentChecking() [Fact] public void Merge_DefaultScheduler() { - var xs = Observable.Merge(Observable.Return(42), Observable.Return(43), Observable.Return(44)); + var xs = Observable.Merge(Observable.Return(42), Observable.Return(43), Observable.Return(44)); var res = xs.ToList().Single(); Assert.True(new[] { 42, 43, 44 }.SequenceEqual(res)); } @@ -1164,7 +1164,7 @@ public void MergeConcat_Basic() OnCompleted(300) ); - var xs = scheduler.CreateHotObservable>( + var xs = scheduler.CreateHotObservable( OnNext>(210, ys1), OnNext>(260, ys2), OnNext>(270, ys3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MinTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MinTest.cs index 06d0d85253..c28c317648 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MinTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MinTest.cs @@ -2106,7 +2106,7 @@ public void Min_Selector_Regular_Int32() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2130,7 +2130,7 @@ public void Min_Selector_Regular_Int64() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2154,7 +2154,7 @@ public void Min_Selector_Regular_Single() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2178,7 +2178,7 @@ public void Min_Selector_Regular_Double() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2202,7 +2202,7 @@ public void Min_Selector_Regular_Decimal() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2226,7 +2226,7 @@ public void Min_Selector_Regular_Int32_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2250,7 +2250,7 @@ public void Min_Selector_Regular_Int64_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2274,7 +2274,7 @@ public void Min_Selector_Regular_Single_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2298,7 +2298,7 @@ public void Min_Selector_Regular_Double_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2322,7 +2322,7 @@ public void Min_Selector_Regular_Decimal_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -2346,7 +2346,7 @@ public void MinOfT_Selector_Regular() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "qux"), OnNext(220, "foo"), OnNext(230, "bar"), @@ -2370,7 +2370,7 @@ public void MinOfT_Selector_Regular_Comparer() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "qux"), OnNext(220, "foo"), OnNext(230, "bar"), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MostRecentTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MostRecentTest.cs index 432f4421d4..2932b3f301 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MostRecentTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MostRecentTest.cs @@ -73,7 +73,7 @@ public void MostRecent2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MulticastTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MulticastTest.cs index 80b56ac3d0..d21c9dc8aa 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MulticastTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/MulticastTest.cs @@ -19,9 +19,9 @@ public class MulticastTest : ReactiveTest [Fact] public void Multicast_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Multicast(null, new Subject())); + ReactiveAssert.Throws(() => Observable.Multicast(null, new Subject())); ReactiveAssert.Throws(() => Observable.Multicast(DummyObservable.Instance, null)); - ReactiveAssert.Throws(() => Observable.Multicast(null, () => new Subject(), xs => xs)); + ReactiveAssert.Throws(() => Observable.Multicast(null, () => new Subject(), xs => xs)); ReactiveAssert.Throws(() => Observable.Multicast(DummyObservable.Instance, null, xs => xs)); ReactiveAssert.Throws(() => Observable.Multicast(DummyObservable.Instance, () => new Subject(), null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NeverTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NeverTest.cs index 360724f0ef..48e7bc273b 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NeverTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NeverTest.cs @@ -16,7 +16,7 @@ public class NeverTest : ReactiveTest public void Never_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.Never().Subscribe(null)); - ReactiveAssert.Throws(() => Observable.Never(42).Subscribe(null)); + ReactiveAssert.Throws(() => Observable.Never(42).Subscribe(null)); } [Fact] @@ -41,7 +41,7 @@ public void Never_Basic_Witness() { var scheduler = new TestScheduler(); - var xs = Observable.Never(42); + var xs = Observable.Never(42); var res = scheduler.CreateObserver(); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NextTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NextTest.cs index d8009be1ce..a55e928f6d 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NextTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/NextTest.cs @@ -70,7 +70,7 @@ public void Next2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs index e4dda4fd70..15517763a9 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs @@ -51,7 +51,7 @@ public void ObserveOn_ArgumentChecking() ReactiveAssert.Throws(() => DispatcherObservable.ObserveOnDispatcher(default(IObservable))); #endif ReactiveAssert.Throws(() => Observable.ObserveOn(default, new SynchronizationContext())); - ReactiveAssert.Throws(() => Observable.ObserveOn(someObservable, default(SynchronizationContext))); + ReactiveAssert.Throws(() => Observable.ObserveOn(someObservable, default(SynchronizationContext))); } #if HAS_WINFORMS @@ -649,16 +649,16 @@ public void ObserveOn_SynchronizationContext_Simple() internal class MyCtx : SynchronizationContext { - private IScheduler scheduler; + private IScheduler _scheduler; public MyCtx(IScheduler scheduler) { - this.scheduler = scheduler; + _scheduler = scheduler; } public override void Post(SendOrPostCallback d, object state) { - scheduler.Schedule(state, (self, s) => { d(s); return Disposable.Empty; }); + _scheduler.Schedule(state, (self, s) => { d(s); return Disposable.Empty; }); } } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OfTypeTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OfTypeTest.cs index 5985d33fa2..5c2d8de7cd 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OfTypeTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OfTypeTest.cs @@ -26,7 +26,7 @@ public void OfType_Complete() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new A(1)), OnNext(230, new E(2)), @@ -49,12 +49,12 @@ public void OfType_Complete() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(240, new D(3)), - OnNext(260, new B(5)), - OnNext(270, new B(6)), + OnNext(260, new B(5)), + OnNext(270, new B(6)), OnNext(280, new D(7)), - OnNext(340, new B(10)), + OnNext(340, new B(10)), OnCompleted(350) ); @@ -70,7 +70,7 @@ public void OfType_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new A(1)), OnNext(230, new E(2)), @@ -93,12 +93,12 @@ public void OfType_Error() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(240, new D(3)), - OnNext(260, new B(5)), - OnNext(270, new B(6)), + OnNext(260, new B(5)), + OnNext(270, new B(6)), OnNext(280, new D(7)), - OnNext(340, new B(10)), + OnNext(340, new B(10)), OnError(350, ex) ); @@ -112,7 +112,7 @@ public void OfType_Dispose() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, new B(0)), OnNext(220, new A(1)), OnNext(230, new E(2)), @@ -136,10 +136,10 @@ public void OfType_Dispose() ); res.Messages.AssertEqual( - OnNext(210, new B(0)), + OnNext(210, new B(0)), OnNext(240, new D(3)), - OnNext(260, new B(5)), - OnNext(270, new B(6)) + OnNext(260, new B(5)), + OnNext(270, new B(6)) ); xs.Subscriptions.AssertEqual( diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OnErrorResumeNextTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OnErrorResumeNextTest.cs index c01ac1a79d..781cb91f56 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OnErrorResumeNextTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/OnErrorResumeNextTest.cs @@ -23,11 +23,11 @@ public void OnErrorResumeNext_ArgumentChecking() var xs = DummyObservable.Instance; ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(null)); - ReactiveAssert.Throws(() => Observable.OnErrorResumeNext((IEnumerable>)null)); - ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(null, xs)); - ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(xs, null)); - ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(null, xs)); - ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(xs, null)); + ReactiveAssert.Throws(() => Observable.OnErrorResumeNext((IEnumerable>)null)); + ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(null, xs)); + ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(xs, null)); + ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(null, xs)); + ReactiveAssert.Throws(() => Observable.OnErrorResumeNext(xs, null)); } [Fact] @@ -53,20 +53,20 @@ public void OnErrorResumeNext_IEofIO() { var scheduler = new TestScheduler(); - var xs1 = scheduler.CreateColdObservable( + var xs1 = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), OnCompleted(40) ); - var xs2 = scheduler.CreateColdObservable( + var xs2 = scheduler.CreateColdObservable( OnNext(10, 4), OnNext(20, 5), OnError(30, new Exception()) ); - var xs3 = scheduler.CreateColdObservable( + var xs3 = scheduler.CreateColdObservable( OnNext(10, 6), OnNext(20, 7), OnNext(30, 8), @@ -247,7 +247,7 @@ public void OnErrorResumeNext_EmptyReturnThrowAndMore() ); var o5 = scheduler.CreateHotObservable( - OnNext(245, 5), + OnNext(245, 5), OnCompleted(250) ); @@ -463,7 +463,7 @@ public void OnErrorResumeNext_IteratorThrows() var ex = new Exception(); var res = scheduler.Start(() => - Observable.OnErrorResumeNext(Catch_IteratorThrows_Source(ex, true)) + Observable.OnErrorResumeNext(Catch_IteratorThrows_Source(ex, true)) ); res.Messages.AssertEqual( @@ -640,7 +640,7 @@ public void OnErrorResumeNext_TailRecursive1() var scheduler = new TestScheduler(); - var o = scheduler.CreateColdObservable( + var o = scheduler.CreateColdObservable( OnNext(10, 1), OnNext(20, 2), OnNext(30, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RefCountTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RefCountTest.cs index b2e58971a1..90dd63f64f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RefCountTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RefCountTest.cs @@ -24,7 +24,7 @@ public void RefCount_ConnectsOnFirst() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -112,7 +112,7 @@ public void RefCount_Publish() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -188,7 +188,7 @@ public void LazyRefCount_ConnectsOnFirst() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -284,7 +284,7 @@ public void LazyRefCount_Publish() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatTest.cs index 22b167b23c..db4bb60ee3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatTest.cs @@ -358,7 +358,7 @@ public void Repeat_Observable_Throws() scheduler3.Start(); - var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Repeat(); + var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Repeat(); ReactiveAssert.Throws(() => xss.Subscribe()); } @@ -529,7 +529,7 @@ public void Repeat_Observable_RepeatCount_Throws() scheduler3.Start(); - var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Repeat(3); + var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Repeat(3); ReactiveAssert.Throws(() => xss.Subscribe()); } @@ -537,7 +537,7 @@ public void Repeat_Observable_RepeatCount_Throws() [Fact] public void Repeat_Observable_RepeatCount_Default_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Repeat(default(IObservable), 0)); + ReactiveAssert.Throws(() => Observable.Repeat(default(IObservable), 0)); ReactiveAssert.Throws(() => DummyObservable.Instance.Repeat(-1)); ReactiveAssert.Throws(() => DummyObservable.Instance.Repeat(0).Subscribe(null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatWhenTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatWhenTest.cs index 682296eec5..18f3af9237 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatWhenTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RepeatWhenTest.cs @@ -59,7 +59,7 @@ public void RepeatWhen_Handler_Error() var ex = new InvalidOperationException(); var res = scheduler.Start(() => - xs.RepeatWhen(v => v.Select(w => throw ex)) + xs.RepeatWhen(v => v.Select(w => throw ex)) ); res.Messages.AssertEqual( @@ -83,7 +83,7 @@ public void RepeatWhen_Handler_Completed() var ex = new InvalidOperationException(); var res = scheduler.Start(() => - xs.RepeatWhen(v => v.Take(1).Skip(1)) + xs.RepeatWhen(v => v.Take(1).Skip(1)) ); res.Messages.AssertEqual( @@ -289,7 +289,7 @@ public void RepeatWhen_Throws() scheduler3.Start(); - var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).RepeatWhen(v => v); + var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).RepeatWhen(v => v); ReactiveAssert.Throws(() => xss.Subscribe()); } @@ -473,7 +473,7 @@ public void RepeatWhen_RepeatCount_Throws() scheduler3.Start(); - var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).RepeatWhen(v => + var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).RepeatWhen(v => { var count = 0; return v.TakeWhile(w => ++count < 3); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ReplayTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ReplayTest.cs index 7f196ee7be..3fac82766c 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ReplayTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ReplayTest.cs @@ -26,15 +26,15 @@ public void Replay_ArgumentChecking() ReactiveAssert.Throws(() => Observable.Replay(default(IObservable), x => x)); ReactiveAssert.Throws(() => Observable.Replay(someObservable, null)); ReactiveAssert.Throws(() => Observable.Replay(null, DummyScheduler.Instance)); - ReactiveAssert.Throws(() => Observable.Replay(DummyObservable.Instance, null)); - ReactiveAssert.Throws(() => Observable.Replay(null, DummyFunc, IObservable>.Instance, DummyScheduler.Instance)); + ReactiveAssert.Throws(() => Observable.Replay(DummyObservable.Instance, null)); + ReactiveAssert.Throws(() => Observable.Replay(null, DummyFunc, IObservable>.Instance, DummyScheduler.Instance)); ReactiveAssert.Throws(() => Observable.Replay(DummyObservable.Instance, null, DummyScheduler.Instance)); - ReactiveAssert.Throws(() => Observable.Replay(DummyObservable.Instance, DummyFunc, IObservable>.Instance, null)); + ReactiveAssert.Throws(() => Observable.Replay(DummyObservable.Instance, DummyFunc, IObservable>.Instance, null)); ReactiveAssert.Throws(() => Observable.Replay(default(IObservable), TimeSpan.FromSeconds(1))); ReactiveAssert.Throws(() => Observable.Replay(someObservable, TimeSpan.FromSeconds(-1))); ReactiveAssert.Throws(() => Observable.Replay(default(IObservable), x => x, TimeSpan.FromSeconds(1))); ReactiveAssert.Throws(() => Observable.Replay(someObservable, null, TimeSpan.FromSeconds(1))); - ReactiveAssert.Throws(() => Observable.Replay(someObservable, x => x, TimeSpan.FromSeconds(-1))); + ReactiveAssert.Throws(() => Observable.Replay(someObservable, x => x, TimeSpan.FromSeconds(-1))); ReactiveAssert.Throws(() => Observable.Replay(default(IObservable), TimeSpan.FromSeconds(1), scheduler)); ReactiveAssert.Throws(() => Observable.Replay(someObservable, TimeSpan.FromSeconds(-1), scheduler)); ReactiveAssert.Throws(() => Observable.Replay(someObservable, TimeSpan.FromSeconds(1), default)); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RetryTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RetryTest.cs index 91c526da55..2d5bf98634 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RetryTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RetryTest.cs @@ -331,7 +331,7 @@ public void Retry_Observable_RetryCount_Throws() ReactiveAssert.Throws(() => scheduler3.Start()); - var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Retry(3); + var xss = Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Retry(3); ReactiveAssert.Throws(() => xss.Subscribe()); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RunAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RunAsyncTest.cs index 3da2a7c557..f493136d4b 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RunAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/RunAsyncTest.cs @@ -20,7 +20,7 @@ public void RunAsync_ArgumentChecking() { var ct = CancellationToken.None; - ReactiveAssert.Throws(() => Observable.RunAsync(default(IObservable), ct)); + ReactiveAssert.Throws(() => Observable.RunAsync(default(IObservable), ct)); ReactiveAssert.Throws(() => Observable.RunAsync(default, ct)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ScanTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ScanTest.cs index ca4a3283c7..c604ac78c3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ScanTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ScanTest.cs @@ -18,9 +18,9 @@ public void Scan_ArgumentChecking() var someObservable = Observable.Empty(); ReactiveAssert.Throws(() => Observable.Scan(null, (_, __) => 0)); - ReactiveAssert.Throws(() => Observable.Scan(someObservable, null)); + ReactiveAssert.Throws(() => Observable.Scan(someObservable, null)); ReactiveAssert.Throws(() => Observable.Scan(null, 0, (_, __) => 0)); - ReactiveAssert.Throws(() => Observable.Scan(someObservable, 0, null)); + ReactiveAssert.Throws(() => Observable.Scan(someObservable, 0, null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectManyTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectManyTest.cs index c35d9f1ce1..a7278f26f3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectManyTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectManyTest.cs @@ -416,7 +416,7 @@ public void SelectMany_Then_Error_Error() [Fact] public void SelectMany_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance).Subscribe(null)); } @@ -1003,7 +1003,7 @@ public void SelectMany_UseFunction() [Fact] public void SelectManyWithIndex_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance).Subscribe(null)); } @@ -1622,11 +1622,11 @@ public void SelectManyWithIndex_UseFunction() [Fact] public void SelectMany_Enumerable_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance).Subscribe(null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, (Func)null)); } @@ -2063,18 +2063,18 @@ public void SelectMany_Enumerable_SelectorThrows_ResultSelector() private class CurrentThrowsEnumerable : IEnumerable { - private IEnumerable e; - private readonly Exception ex; + private IEnumerable _e; + private readonly Exception _ex; public CurrentThrowsEnumerable(IEnumerable e, Exception ex) { - this.e = e; - this.ex = ex; + _e = e; + _ex = ex; } public IEnumerator GetEnumerator() { - return new Enumerator(e.GetEnumerator(), ex); + return new Enumerator(_e.GetEnumerator(), _ex); } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() @@ -2084,23 +2084,23 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() private class Enumerator : IEnumerator { - private IEnumerator e; - private readonly Exception ex; + private IEnumerator _e; + private readonly Exception _ex; public Enumerator(IEnumerator e, Exception ex) { - this.e = e; - this.ex = ex; + _e = e; + _ex = ex; } public T Current { - get { throw ex; } + get { throw _ex; } } public void Dispose() { - e.Dispose(); + _e.Dispose(); } object System.Collections.IEnumerator.Current @@ -2110,12 +2110,12 @@ object System.Collections.IEnumerator.Current public bool MoveNext() { - return e.MoveNext(); + return _e.MoveNext(); } public void Reset() { - e.Reset(); + _e.Reset(); } } } @@ -2178,18 +2178,18 @@ public void SelectMany_Enumerable_CurrentThrows_ResultSelector() private class MoveNextThrowsEnumerable : IEnumerable { - private IEnumerable e; - private readonly Exception ex; + private IEnumerable _e; + private readonly Exception _ex; public MoveNextThrowsEnumerable(IEnumerable e, Exception ex) { - this.e = e; - this.ex = ex; + _e = e; + _ex = ex; } public IEnumerator GetEnumerator() { - return new Enumerator(e.GetEnumerator(), ex); + return new Enumerator(_e.GetEnumerator(), _ex); } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() @@ -2199,23 +2199,23 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() private class Enumerator : IEnumerator { - private IEnumerator e; - private readonly Exception ex; + private IEnumerator _e; + private readonly Exception _ex; public Enumerator(IEnumerator e, Exception ex) { - this.e = e; - this.ex = ex; + _e = e; + _ex = ex; } public T Current { - get { return e.Current; } + get { return _e.Current; } } public void Dispose() { - e.Dispose(); + _e.Dispose(); } object System.Collections.IEnumerator.Current @@ -2225,12 +2225,12 @@ object System.Collections.IEnumerator.Current public bool MoveNext() { - throw ex; + throw _ex; } public void Reset() { - e.Reset(); + _e.Reset(); } } } @@ -2322,11 +2322,11 @@ public void SelectMany_Enumerable_MoveNextThrows_ResultSelector() [Fact] public void SelectManyWithIndex_Enumerable_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance).Subscribe(null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, (Func)null)); } @@ -2974,23 +2974,23 @@ public void SelectManyWithIndex_Enumerable_MoveNextThrows_ResultSelector() [Fact] public void SelectMany_QueryOperator_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, DummyFunc.Instance).Subscribe(null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); } @@ -3248,7 +3248,7 @@ select Throw(ex) [Fact] public void SelectManyWithIndex_QueryOperator_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, DummyFunc.Instance).Subscribe(null)); @@ -5960,17 +5960,17 @@ public void SelectMany_TaskWithCompletionSource_WithResultSelector_Cancellation_ [Fact] public void SelectManyWithIndex_Task_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null)); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); - ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => ((IObservable)null).SelectMany(DummyFunc>.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany((Func>)null, DummyFunc.Instance)); ReactiveAssert.Throws(() => DummyObservable.Instance.SelectMany(DummyFunc>.Instance, ((Func)null))); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectTest.cs index 8bd80d52e7..97b737ff1a 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SelectTest.cs @@ -19,36 +19,36 @@ public class SelectTest : ReactiveTest [Fact] public void Select_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).Select(DummyFunc.Instance)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Select((Func)null)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Select(DummyFunc.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ((IObservable)null).Select(DummyFunc.Instance)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Select((Func)null)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Select(DummyFunc.Instance).Subscribe(null)); } [Fact] public void Select_Throws() { ReactiveAssert.Throws(() => - Observable.Return(1).Select(x => x).Subscribe( + Observable.Return(1).Select(x => x).Subscribe( x => { throw new InvalidOperationException(); })); ReactiveAssert.Throws(() => - Observable.Throw(new Exception()).Select(x => x).Subscribe( + Observable.Throw(new Exception()).Select(x => x).Subscribe( x => { }, exception => { throw new InvalidOperationException(); })); ReactiveAssert.Throws(() => - Observable.Empty().Select(x => x).Subscribe( + Observable.Empty().Select(x => x).Subscribe( x => { }, exception => { }, () => { throw new InvalidOperationException(); })); - ReactiveAssert.Throws(() => Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Select(x => x).Subscribe()); + ReactiveAssert.Throws(() => Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Select(x => x).Subscribe()); } [Fact] @@ -268,36 +268,36 @@ public void Select_SelectorThrows() [Fact] public void SelectWithIndex_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).Select(DummyFunc.Instance)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Select((Func)null)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Select(DummyFunc.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ((IObservable)null).Select(DummyFunc.Instance)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Select((Func)null)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Select(DummyFunc.Instance).Subscribe(null)); } [Fact] public void SelectWithIndex_Throws() { ReactiveAssert.Throws(() => - Observable.Return(1).Select((x, index) => x).Subscribe( + Observable.Return(1).Select((x, index) => x).Subscribe( x => { throw new InvalidOperationException(); })); ReactiveAssert.Throws(() => - Observable.Throw(new Exception()).Select((x, index) => x).Subscribe( + Observable.Throw(new Exception()).Select((x, index) => x).Subscribe( x => { }, exception => { throw new InvalidOperationException(); })); ReactiveAssert.Throws(() => - Observable.Empty().Select((x, index) => x).Subscribe( + Observable.Empty().Select((x, index) => x).Subscribe( x => { }, exception => { }, () => { throw new InvalidOperationException(); })); - ReactiveAssert.Throws(() => Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Select((x, index) => x).Subscribe()); + ReactiveAssert.Throws(() => Observable.Create(new Func, Action>(o => { throw new InvalidOperationException(); })).Select((x, index) => x).Subscribe()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SequenceEqualTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SequenceEqualTest.cs index 6983db9306..1ee9182dda 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SequenceEqualTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SequenceEqualTest.cs @@ -18,17 +18,17 @@ public class SequenceEqualTest : ReactiveTest [Fact] public void SequenceEqual_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.SequenceEqual(default, DummyObservable.Instance)); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IObservable))); - ReactiveAssert.Throws(() => Observable.SequenceEqual(default, DummyObservable.Instance, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IObservable), EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, DummyObservable.Instance, default)); - - ReactiveAssert.Throws(() => Observable.SequenceEqual(default, new[] { 42 })); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IEnumerable))); - ReactiveAssert.Throws(() => Observable.SequenceEqual(default, new[] { 42 }, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IEnumerable), EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, new[] { 42 }, default)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(default, DummyObservable.Instance)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IObservable))); + ReactiveAssert.Throws(() => Observable.SequenceEqual(default, DummyObservable.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IObservable), EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, DummyObservable.Instance, default)); + + ReactiveAssert.Throws(() => Observable.SequenceEqual(default, new[] { 42 })); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IEnumerable))); + ReactiveAssert.Throws(() => Observable.SequenceEqual(default, new[] { 42 }, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, default(IEnumerable), EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.SequenceEqual(DummyObservable.Instance, new[] { 42 }, default)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleOrDefaultTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleOrDefaultTest.cs index 9723ee68e2..859f2c1eb3 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleOrDefaultTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleOrDefaultTest.cs @@ -38,7 +38,7 @@ public void SingleOrDefaultPredicate_Empty() public void SingleOrDefault_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).SingleOrDefault()); + Assert.Equal(value, Observable.Return(value).SingleOrDefault()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleTest.cs index efbaaed78e..dbb2463c56 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SingleTest.cs @@ -38,7 +38,7 @@ public void SinglePredicate_Empty() public void Single_Return() { var value = 42; - Assert.Equal(value, Observable.Return(value).Single()); + Assert.Equal(value, Observable.Return(value).Single()); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipLastTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipLastTest.cs index d4795d4f1c..39afd326cd 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipLastTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipLastTest.cs @@ -387,7 +387,7 @@ public void SkipLast_Zero1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -413,7 +413,7 @@ public void SkipLast_Zero2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -441,7 +441,7 @@ public void SkipLast_Some1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -466,7 +466,7 @@ public void SkipLast_Some2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -502,7 +502,7 @@ public void SkipLast_All() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -528,7 +528,7 @@ public void SkipLast_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipTest.cs index fe38184c21..7ffde04614 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipTest.cs @@ -500,7 +500,7 @@ public void Skip_Zero() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -526,7 +526,7 @@ public void Skip_Some() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -551,7 +551,7 @@ public void Skip_Late() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -577,7 +577,7 @@ public void Skip_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); @@ -623,7 +623,7 @@ public void Skip_Twice1() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -656,7 +656,7 @@ public void Skip_Twice2() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipUntilTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipUntilTest.cs index 17822fad9e..4231902f66 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipUntilTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SkipUntilTest.cs @@ -456,7 +456,7 @@ public void SkipUntil_Zero() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -482,7 +482,7 @@ public void SkipUntil_Some() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -507,7 +507,7 @@ public void SkipUntil_Late() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -533,7 +533,7 @@ public void SkipUntil_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); @@ -579,7 +579,7 @@ public void SkipUntil_Twice1() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -612,7 +612,7 @@ public void SkipUntil_Twice2() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartAsyncTest.cs index b9250681d6..b57785e6e0 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartAsyncTest.cs @@ -17,13 +17,13 @@ namespace ReactiveTests.Tests public class StartAsyncTest : ReactiveTest { - private readonly Task doneTask; + private readonly Task _doneTask; public StartAsyncTest() { var tcs = new TaskCompletionSource(); tcs.SetResult(42); - doneTask = tcs.Task; + _doneTask = tcs.Task; } #region Func @@ -33,14 +33,14 @@ public void StartAsync_Func_ArgumentChecking() { var s = Scheduler.Immediate; - ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>))); - ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>))); + ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>))); + ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>))); - ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>), s)); - ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>), s)); + ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>), s)); + ReactiveAssert.Throws(() => Observable.StartAsync(default(Func>), s)); - ReactiveAssert.Throws(() => Observable.StartAsync(() => doneTask, default)); - ReactiveAssert.Throws(() => Observable.StartAsync(ct => doneTask, default)); + ReactiveAssert.Throws(() => Observable.StartAsync(() => _doneTask, default)); + ReactiveAssert.Throws(() => Observable.StartAsync(ct => _doneTask, default)); } [Fact] @@ -81,7 +81,7 @@ public void StartAsync_Func_Throw_Asynchronous() { var ex = new Exception(); - var xs = Observable.StartAsync(() => + var xs = Observable.StartAsync(() => Task.Factory.StartNew(() => { throw ex; @@ -128,7 +128,7 @@ public void StartAsync_FuncWithCancel_Throw_Asynchronous() { var ex = new Exception(); - var xs = Observable.StartAsync(ct => + var xs = Observable.StartAsync(ct => Task.Factory.StartNew(() => { throw ex; }) ); @@ -245,8 +245,8 @@ public void StartAsync_Action_ArgumentChecking() ReactiveAssert.Throws(() => Observable.StartAsync(default(Func), s)); ReactiveAssert.Throws(() => Observable.StartAsync(default(Func), s)); - ReactiveAssert.Throws(() => Observable.StartAsync(() => (Task)doneTask, default)); - ReactiveAssert.Throws(() => Observable.StartAsync(ct => (Task)doneTask, default)); + ReactiveAssert.Throws(() => Observable.StartAsync(() => (Task)_doneTask, default)); + ReactiveAssert.Throws(() => Observable.StartAsync(ct => (Task)_doneTask, default)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartTest.cs index 3ee23180ad..a5832c377c 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/StartTest.cs @@ -24,7 +24,7 @@ public void Start_ArgumentChecking() ReactiveAssert.Throws(() => Observable.Start(null, someScheduler)); ReactiveAssert.Throws(() => Observable.Start(null, someScheduler)); ReactiveAssert.Throws(() => Observable.Start(() => { }, null)); - ReactiveAssert.Throws(() => Observable.Start(() => 1, null)); + ReactiveAssert.Throws(() => Observable.Start(() => 1, null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs index 1c675f72af..1c1c7dfa85 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs @@ -46,7 +46,7 @@ public void SubscribeOn_ArgumentChecking() ReactiveAssert.Throws(() => DispatcherObservable.SubscribeOnDispatcher(default(IObservable))); #endif ReactiveAssert.Throws(() => Observable.SubscribeOn(default, new SynchronizationContext())); - ReactiveAssert.Throws(() => Observable.SubscribeOn(someObservable, default(SynchronizationContext))); + ReactiveAssert.Throws(() => Observable.SubscribeOn(someObservable, default(SynchronizationContext))); } #if HAS_WINFORMS diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeTest.cs index fc134326de..fc20cfe01b 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeTest.cs @@ -20,12 +20,12 @@ public class SubscribeTest : ReactiveTest [Fact] public void SubscribeToEnumerable_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.Subscribe(null, DummyObserver.Instance)); - ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, null)); + ReactiveAssert.Throws(() => Observable.Subscribe(null, DummyObserver.Instance)); + ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, null)); - ReactiveAssert.Throws(() => Observable.Subscribe(null, DummyObserver.Instance, DummyScheduler.Instance)); - ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, DummyObserver.Instance, null)); - ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, null, DummyScheduler.Instance)); + ReactiveAssert.Throws(() => Observable.Subscribe(null, DummyObserver.Instance, DummyScheduler.Instance)); + ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, DummyObserver.Instance, null)); + ReactiveAssert.Throws(() => Observable.Subscribe(DummyEnumerable.Instance, null, DummyScheduler.Instance)); ReactiveAssert.Throws(() => NullEnumeratorEnumerable.Instance.Subscribe(Observer.Create(x => { }), Scheduler.CurrentThread)); } @@ -180,20 +180,20 @@ public void Subscribe_ArgumentChecking() ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(Action))); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(Action))); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, () => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, () => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action))); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, () => { })); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action))); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, (Exception _) => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action))); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { })); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action))); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, (Exception _) => { }, () => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, () => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default, () => { })); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, (Exception _) => { }, default(Action))); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, () => { })); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default, () => { })); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, (Exception _) => { }, default(Action))); } [Fact] @@ -281,26 +281,26 @@ public void Subscribe_CT_ArgumentChecking() var someObserver = Observer.Create(_ => { }); var ct = CancellationToken.None; - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, someObserver, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(IObserver), ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, someObserver, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(IObserver), ct)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, ct)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(Action), ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default(Action), ct)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, () => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, () => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action), ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, () => { }, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action), ct)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, (Exception _) => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action), ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default(Action), ct)); ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(default, _ => { }, (Exception _) => { }, () => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, () => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default, () => { }, ct)); - ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, (Exception _) => { }, default, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, default, (Exception _) => { }, () => { }, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, default, () => { }, ct)); + ReactiveAssert.Throws(() => ObservableExtensions.Subscribe(someObservable, _ => { }, (Exception _) => { }, default, ct)); } [Fact] @@ -462,7 +462,7 @@ public void Subscribe_CT_NeverCancel() [Fact] public void Subscribe_CT_Overloads_AlreadyCancelled() { - var xs = Observable.Defer(() => + var xs = Observable.Defer(() => { Assert.True(false); return Observable.Return(42, Scheduler.Immediate); @@ -487,7 +487,7 @@ public void Subscribe_CT_Overloads_None() var e = 0; var c = 0; - var xs = Observable.Defer(() => + var xs = Observable.Defer(() => { i++; return Observable.Return(42, Scheduler.Immediate); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SumTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SumTest.cs index a72da91332..d3e960c9fe 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SumTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SumTest.cs @@ -1394,7 +1394,7 @@ public void Sum_Selector_Regular_Int32() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1418,7 +1418,7 @@ public void Sum_Selector_Regular_Int64() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1442,7 +1442,7 @@ public void Sum_Selector_Regular_Single() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1466,7 +1466,7 @@ public void Sum_Selector_Regular_Double() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1490,7 +1490,7 @@ public void Sum_Selector_Regular_Decimal() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1514,7 +1514,7 @@ public void Sum_Selector_Regular_Int32_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1538,7 +1538,7 @@ public void Sum_Selector_Regular_Int64_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1562,7 +1562,7 @@ public void Sum_Selector_Regular_Single_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1586,7 +1586,7 @@ public void Sum_Selector_Regular_Double_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), @@ -1610,7 +1610,7 @@ public void Sum_Selector_Regular_Decimal_Nullable() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, "fo"), OnNext(220, "b"), OnNext(230, "qux"), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SynchronizeTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SynchronizeTest.cs index 73edc6a898..dce6876604 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SynchronizeTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SynchronizeTest.cs @@ -22,7 +22,7 @@ public void Synchronize_ArgumentChecking() ReactiveAssert.Throws(() => Observable.Synchronize(default)); ReactiveAssert.Throws(() => Observable.Synchronize(default, new object())); - ReactiveAssert.Throws(() => Observable.Synchronize(someObservable, null)); + ReactiveAssert.Throws(() => Observable.Synchronize(someObservable, null)); } #if !NO_THREAD diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastBufferTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastBufferTest.cs index 021f096860..825d4bef90 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastBufferTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastBufferTest.cs @@ -330,7 +330,7 @@ public void TakeLastBuffer_Zero1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -355,7 +355,7 @@ public void TakeLastBuffer_Zero2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -381,7 +381,7 @@ public void TakeLastBuffer_Some1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -407,7 +407,7 @@ public void TakeLastBuffer_Some2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -433,7 +433,7 @@ public void TakeLastBuffer_Some3() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -465,7 +465,7 @@ public void TakeLastBuffer_Some4() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(240, 2), OnNext(250, 3), @@ -494,7 +494,7 @@ public void TakeLastBuffer_All() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -521,7 +521,7 @@ public void TakeLastBuffer_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastTest.cs index b69965e932..573979d7a8 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeLastTest.cs @@ -350,7 +350,7 @@ public void TakeLast_Zero1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -374,7 +374,7 @@ public void TakeLast_Zero1_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -398,7 +398,7 @@ public void TakeLast_Zero2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -423,7 +423,7 @@ public void TakeLast_Zero2_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -448,7 +448,7 @@ public void TakeLast_Some1() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -475,7 +475,7 @@ public void TakeLast_Some1_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -502,7 +502,7 @@ public void TakeLast_Some2() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -527,7 +527,7 @@ public void TakeLast_Some2_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -552,7 +552,7 @@ public void TakeLast_Some3() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -587,7 +587,7 @@ public void TakeLast_Some3_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -622,7 +622,7 @@ public void TakeLast_Some4() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(240, 2), OnNext(250, 3), @@ -650,7 +650,7 @@ public void TakeLast_Some4_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(240, 2), OnNext(250, 3), @@ -678,7 +678,7 @@ public void TakeLast_All() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -704,7 +704,7 @@ public void TakeLast_All_WithLoopScheduler() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -732,7 +732,7 @@ public void TakeLast_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); @@ -756,7 +756,7 @@ public void TakeLast_Error_WithLoopScheduler() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeTest.cs index 282aafc8a0..a2e24ed13c 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeTest.cs @@ -623,7 +623,7 @@ public void Take_Zero() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -647,7 +647,7 @@ public void Take_Some() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -674,7 +674,7 @@ public void Take_Late() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -702,7 +702,7 @@ public void Take_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); @@ -749,7 +749,7 @@ public void Take_Twice1() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -782,7 +782,7 @@ public void Take_Twice2() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeUntilTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeUntilTest.cs index 54947b3fb5..53aef25992 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeUntilTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TakeUntilTest.cs @@ -416,7 +416,7 @@ public void TakeUntil_Error_Some() var r = scheduler.CreateHotObservable( OnNext(150, 1), - OnNext(240, 2) + OnNext(240, 2) ); var res = scheduler.Start(() => @@ -472,7 +472,7 @@ public void TakeUntil_Zero() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -496,7 +496,7 @@ public void TakeUntil_Some() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -523,7 +523,7 @@ public void TakeUntil_Late() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnCompleted(230) @@ -551,7 +551,7 @@ public void TakeUntil_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnError(210, ex) ); @@ -598,7 +598,7 @@ public void TakeUntil_Twice1() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -631,7 +631,7 @@ public void TakeUntil_Twice2() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3), @@ -685,7 +685,7 @@ public void TakeUntil_Default() public void TakeUntil_Predicate_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.TakeUntil(null, v => true)); - ReactiveAssert.Throws(() => Observable.TakeUntil(DummyObservable.Instance, null)); + ReactiveAssert.Throws(() => Observable.TakeUntil(DummyObservable.Instance, null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThenTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThenTest.cs index 8ee7e94aa4..65256cc0f6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThenTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThenTest.cs @@ -20,21 +20,21 @@ public void Then_ArgumentChecking() ReactiveAssert.Throws(() => Observable.Then(null, _ => _)); ReactiveAssert.Throws(() => Observable.Then(someObservable, null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); - ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); + ReactiveAssert.Throws(() => Observable.And(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then(null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrottleTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrottleTest.cs index d492e9a0da..c0489524d1 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrottleTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrottleTest.cs @@ -325,11 +325,11 @@ public void Throttle_Duration_DelayBehavior() ); res.Messages.AssertEqual( - OnNext(250 + 20, 0), - OnNext(280 + 20, 1), - OnNext(310 + 20, 2), - OnNext(350 + 20, 3), - OnNext(400 + 20, 4), + OnNext(250 + 20, 0), + OnNext(280 + 20, 1), + OnNext(310 + 20, 2), + OnNext(350 + 20, 3), + OnNext(400 + 20, 4), OnCompleted(550) ); @@ -387,9 +387,9 @@ public void Throttle_Duration_ThrottleBehavior() ); res.Messages.AssertEqual( - OnNext(250 + 20, 0), - OnNext(310 + 20, 2), - OnNext(400 + 20, 4), + OnNext(250 + 20, 0), + OnNext(310 + 20, 2), + OnNext(400 + 20, 4), OnCompleted(550) ); @@ -447,9 +447,9 @@ public void Throttle_Duration_EarlyCompletion() ); res.Messages.AssertEqual( - OnNext(250 + 20, 0), - OnNext(310 + 20, 2), - OnNext(410, 4), + OnNext(250 + 20, 0), + OnNext(310 + 20, 2), + OnNext(410, 4), OnCompleted(410) ); @@ -492,8 +492,8 @@ public void Throttle_Duration_InnerError() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(450 + 4 * 10, ex) ); @@ -527,8 +527,8 @@ public void Throttle_Duration_OuterError() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(460, ex) ); @@ -570,8 +570,8 @@ public void Throttle_Duration_SelectorThrows() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), OnError(450, ex) ); @@ -604,9 +604,9 @@ public void Throttle_Duration_InnerDone_DelayBehavior() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(350 + 3 * 10, 3), - OnNext(450 + 4 * 10, 4), + OnNext(250 + 2 * 10, 2), + OnNext(350 + 3 * 10, 3), + OnNext(450 + 4 * 10, 4), OnCompleted(550) ); @@ -641,9 +641,9 @@ public void Throttle_Duration_InnerDone_ThrottleBehavior() ); res.Messages.AssertEqual( - OnNext(250 + 2 * 10, 2), - OnNext(300 + 4 * 10, 4), - OnNext(410 + 6 * 10, 6), + OnNext(250 + 2 * 10, 2), + OnNext(300 + 4 * 10, 4), + OnNext(410 + 6 * 10, 6), OnCompleted(550) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrowTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrowTest.cs index 8c14483ef9..e4612b3120 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrowTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ThrowTest.cs @@ -19,11 +19,11 @@ public class ThrowTest : ReactiveTest public void Throw_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.Throw(null)); - ReactiveAssert.Throws(() => Observable.Throw(null, 42)); + ReactiveAssert.Throws(() => Observable.Throw(null, 42)); ReactiveAssert.Throws(() => Observable.Throw(new Exception(), null)); - ReactiveAssert.Throws(() => Observable.Throw(new Exception(), null, 42)); + ReactiveAssert.Throws(() => Observable.Throw(new Exception(), null, 42)); ReactiveAssert.Throws(() => Observable.Throw(null, DummyScheduler.Instance)); - ReactiveAssert.Throws(() => Observable.Throw(null, DummyScheduler.Instance, 42)); + ReactiveAssert.Throws(() => Observable.Throw(null, DummyScheduler.Instance, 42)); ReactiveAssert.Throws(() => Observable.Throw(new Exception(), DummyScheduler.Instance).Subscribe(null)); } @@ -84,7 +84,7 @@ public void Throw_Witness_Basic1() var ex = new Exception(); var res = scheduler.Start(() => - Observable.Throw(ex, scheduler, 42) + Observable.Throw(ex, scheduler, 42) ); res.Messages.AssertEqual( @@ -101,7 +101,7 @@ public void Throw_Witness_Basic2() var res = default(Exception); - Observable.Throw(ex, 42).Subscribe( + Observable.Throw(ex, 42).Subscribe( _ => { Assert.True(false); }, err => { res = err; e.Set(); }, () => { Assert.True(false); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimeoutTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimeoutTest.cs index 5f9cbaf65f..d2c619d26f 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimeoutTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimeoutTest.cs @@ -330,7 +330,7 @@ public void Timeout_TimeoutOccurs_NextIsError() var scheduler = new TestScheduler(); var xs = scheduler.CreateHotObservable( - OnNext(500, 42) + OnNext(500, 42) ); var ys = scheduler.CreateColdObservable( @@ -688,7 +688,7 @@ public void Timeout_Duration_Simple_TimeoutFirst() OnCompleted(450) ); - var ys = scheduler.CreateColdObservable( + var ys = scheduler.CreateColdObservable( OnNext(100, "Boo!") ); @@ -727,14 +727,14 @@ public void Timeout_Duration_Simple_TimeoutFirst_Other() OnCompleted(450) ); - var ys = scheduler.CreateColdObservable( + var ys = scheduler.CreateColdObservable( OnNext(100, "Boo!") ); var zs = scheduler.CreateColdObservable( ); - var ts = scheduler.CreateColdObservable( + var ts = scheduler.CreateColdObservable( OnNext(50, 42), OnCompleted(70) ); @@ -779,7 +779,7 @@ public void Timeout_Duration_Simple_TimeoutLater() var ys = scheduler.CreateColdObservable( ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnNext(50, "Boo!") ); @@ -788,8 +788,8 @@ public void Timeout_Duration_Simple_TimeoutLater() ); res.Messages.AssertEqual( - OnNext(310, 1), - OnNext(350, 2), + OnNext(310, 1), + OnNext(350, 2), OnError(400, ex => ex is TimeoutException) ); @@ -822,11 +822,11 @@ public void Timeout_Duration_Simple_TimeoutLater_Other() var ys = scheduler.CreateColdObservable( ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnNext(50, "Boo!") ); - var ts = scheduler.CreateColdObservable( + var ts = scheduler.CreateColdObservable( OnNext(50, 42), OnCompleted(70) ); @@ -872,7 +872,7 @@ public void Timeout_Duration_Simple_TimeoutLater_NoFirst() OnCompleted(450) ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnNext(50, "Boo!") ); @@ -881,8 +881,8 @@ public void Timeout_Duration_Simple_TimeoutLater_NoFirst() ); res.Messages.AssertEqual( - OnNext(310, 1), - OnNext(350, 2), + OnNext(310, 1), + OnNext(350, 2), OnError(400, ex => ex is TimeoutException) ); @@ -908,11 +908,11 @@ public void Timeout_Duration_Simple_TimeoutLater_Other_NoFirst() OnCompleted(450) ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnNext(50, "Boo!") ); - var ts = scheduler.CreateColdObservable( + var ts = scheduler.CreateColdObservable( OnNext(50, 42), OnCompleted(70) ); @@ -957,7 +957,7 @@ public void Timeout_Duration_Simple_TimeoutByCompletion() var ys = scheduler.CreateColdObservable( ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnCompleted(50) ); @@ -966,8 +966,8 @@ public void Timeout_Duration_Simple_TimeoutByCompletion() ); res.Messages.AssertEqual( - OnNext(310, 1), - OnNext(350, 2), + OnNext(310, 1), + OnNext(350, 2), OnError(400, ex => ex is TimeoutException) ); @@ -1057,7 +1057,7 @@ public void Timeout_Duration_Simple_InnerThrows() var ys = scheduler.CreateColdObservable( ); - var zs = scheduler.CreateColdObservable( + var zs = scheduler.CreateColdObservable( OnError(50, ex) ); @@ -1099,7 +1099,7 @@ public void Timeout_Duration_Simple_FirstThrows() OnCompleted(450) ); - var ys = scheduler.CreateColdObservable( + var ys = scheduler.CreateColdObservable( OnError(50, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimerTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimerTest.cs index bf333323ba..131fad6053 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimerTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimerTest.cs @@ -757,17 +757,17 @@ public DateTimeOffset Now public IDisposable Schedule(TState state, Func action) { - return _scheduler.Schedule(state, GetCatch(action)); + return _scheduler.Schedule(state, GetCatch(action)); } public IDisposable Schedule(TState state, TimeSpan dueTime, Func action) { - return _scheduler.Schedule(state, dueTime, GetCatch(action)); + return _scheduler.Schedule(state, dueTime, GetCatch(action)); } public IDisposable Schedule(TState state, DateTimeOffset dueTime, Func action) { - return _scheduler.Schedule(state, dueTime, GetCatch(action)); + return _scheduler.Schedule(state, dueTime, GetCatch(action)); } private Func GetCatch(Func action) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimestampTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimestampTest.cs index 5c5bb61384..cd3ff95737 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimestampTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/TimestampTest.cs @@ -63,7 +63,7 @@ public void Timestamp_Empty() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(150, 1), OnCompleted(400) ); @@ -88,7 +88,7 @@ public void Timestamp_Error() var ex = new Exception(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(150, 1), OnError(400, ex) ); @@ -111,7 +111,7 @@ public void Timestamp_Never() { var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(150, 1) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToAsyncTest.cs index 6bdaffb94c..4df33007c1 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToAsyncTest.cs @@ -19,79 +19,79 @@ public class ToAsyncTest : ReactiveTest public void ToAsync_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action))); ReactiveAssert.Throws(() => Observable.ToAsync(default)); ReactiveAssert.Throws(() => Observable.ToAsync(default)); var someScheduler = new TestScheduler(); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); - ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); + ReactiveAssert.Throws(() => Observable.ToAsync(default(Action), someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(default, someScheduler)); ReactiveAssert.Throws(() => Observable.ToAsync(() => { }, null)); ReactiveAssert.Throws(() => Observable.ToAsync(a => { }, null)); - ReactiveAssert.Throws(() => Observable.ToAsync(() => 1, null)); + ReactiveAssert.Throws(() => Observable.ToAsync(() => 1, null)); ReactiveAssert.Throws(() => Observable.ToAsync((a, b) => { }, null)); ReactiveAssert.Throws(() => Observable.ToAsync(a => 1, null)); ReactiveAssert.Throws(() => Observable.ToAsync((a, b, c) => { }, null)); @@ -128,8 +128,8 @@ public void ToAsync_ArgumentChecking() [Fact] public void ToAsync0() { - Assert.True(Observable.ToAsync(() => 0)().ToEnumerable().SequenceEqual(new[] { 0 })); - Assert.True(Observable.ToAsync(() => 0, Scheduler.Default)().ToEnumerable().SequenceEqual(new[] { 0 })); + Assert.True(Observable.ToAsync(() => 0)().ToEnumerable().SequenceEqual(new[] { 0 })); + Assert.True(Observable.ToAsync(() => 0, Scheduler.Default)().ToEnumerable().SequenceEqual(new[] { 0 })); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToDictionaryTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToDictionaryTest.cs index 88e1af47ca..1c4fa843ed 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToDictionaryTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToDictionaryTest.cs @@ -18,16 +18,16 @@ public class ToDictionaryTest : ReactiveTest [Fact] public void ToDictionary_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance)); + ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, null)); + ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, DummyFunc.Instance, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null, DummyFunc.Instance, EqualityComparer.Default)); ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, null, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, DummyFunc.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, DummyFunc.Instance, null)); + ReactiveAssert.Throws(() => Observable.ToDictionary(null, DummyFunc.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, null, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToDictionary(DummyObservable.Instance, DummyFunc.Instance, null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToListObservableTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToListObservableTest.cs index 474c7fd5f2..a0a5b78a8a 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToListObservableTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToListObservableTest.cs @@ -68,7 +68,7 @@ public void ToListObservable_OnError() ReactiveAssert.Throws(() => { var t = s.Value; }); res.Messages.AssertEqual( - OnError(600, ex) + OnError(600, ex) ); } @@ -93,7 +93,7 @@ public void ToListObservable_OnCompleted() s.AssertEqual(1, 2, 3); res.Messages.AssertEqual( - OnCompleted(600) + OnCompleted(600) ); Assert.Equal(3, s.Value); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToLookupTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToLookupTest.cs index abd00fb1d9..850996506c 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToLookupTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ToLookupTest.cs @@ -18,16 +18,16 @@ public class ToLookupTest : ReactiveTest [Fact] public void ToLookup_ArgumentChecking() { - ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance)); + ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, null)); + ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, DummyFunc.Instance, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, DummyFunc.Instance, EqualityComparer.Default)); + ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null, DummyFunc.Instance, EqualityComparer.Default)); ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, null, EqualityComparer.Default)); - ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, DummyFunc.Instance, null)); - ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, DummyFunc.Instance)); + ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, DummyFunc.Instance, null)); + ReactiveAssert.Throws(() => Observable.ToLookup(null, DummyFunc.Instance, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, null, DummyFunc.Instance)); ReactiveAssert.Throws(() => Observable.ToLookup(DummyObservable.Instance, DummyFunc.Instance, null)); } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingAsyncTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingAsyncTest.cs index bcb13e01c5..8678001991 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingAsyncTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingAsyncTest.cs @@ -29,9 +29,9 @@ public void UsingAsync_Simple() { var done = new CountdownEvent(1); - var xs = Observable.Using( - ct => Task.Factory.StartNew(() => Disposable.Create(() => done.Signal())), - (_, ct) => Task.Factory.StartNew>(() => Observable.Return(42)) + var xs = Observable.Using( + ct => Task.Factory.StartNew(() => Disposable.Create(() => done.Signal())), + (_, ct) => Task.Factory.StartNew(() => Observable.Return(42)) ); var res = xs.ToEnumerable().ToList(); @@ -52,8 +52,8 @@ public void UsingAsync_CancelResource() var e = new ManualResetEvent(false); var x = new ManualResetEvent(false); - var xs = Observable.Using( - ct => Task.Factory.StartNew(() => + var xs = Observable.Using( + ct => Task.Factory.StartNew(() => { s.Set(); e.WaitOne(); @@ -68,7 +68,7 @@ public void UsingAsync_CancelResource() (_, ct) => { called = true; - return Task.Factory.StartNew>(() => + return Task.Factory.StartNew(() => Observable.Return(42) ); } @@ -100,8 +100,8 @@ public void UsingAsync_CancelFactory() var e = new ManualResetEvent(false); var x = new ManualResetEvent(false); - var xs = Observable.Using( - ct => Task.Factory.StartNew(() => + var xs = Observable.Using( + ct => Task.Factory.StartNew(() => Disposable.Create(() => { lock (gate) @@ -110,7 +110,7 @@ public void UsingAsync_CancelFactory() } }) ), - (_, ct) => Task.Factory.StartNew>(() => + (_, ct) => Task.Factory.StartNew(() => { s.Set(); e.WaitOne(); @@ -120,7 +120,7 @@ public void UsingAsync_CancelFactory() } x.Set(); - return Observable.Defer(() => + return Observable.Defer(() => { called = true; return Observable.Return(42); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs index db2c5d0ec3..51a5a7cafe 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs @@ -94,7 +94,7 @@ public void Using_Complete() _d = d; createInvoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), + OnNext(100, scheduler.Clock), OnCompleted(200)); return xs; } @@ -146,7 +146,7 @@ public void Using_Error() _d = d; createInvoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), + OnNext(100, scheduler.Clock), OnError(200, ex)); return xs; } @@ -197,8 +197,8 @@ public void Using_Dispose() _d = d; createInvoked++; xs = scheduler.CreateColdObservable( - OnNext(100, scheduler.Clock), - OnNext(1000, scheduler.Clock + 1)); + OnNext(100, scheduler.Clock), + OnNext(1000, scheduler.Clock + 1)); return xs; } ) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhenTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhenTest.cs index 564bd9196c..c4cf26a824 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhenTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhenTest.cs @@ -19,7 +19,7 @@ public class WhenTest : ReactiveTest public void When_ArgumentChecking() { ReactiveAssert.Throws(() => Observable.When(null)); - ReactiveAssert.Throws(() => Observable.When((IEnumerable>)null)); + ReactiveAssert.Throws(() => Observable.When((IEnumerable>)null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhereTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhereTest.cs index 20ce973ced..371d1174f4 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhereTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/WhereTest.cs @@ -19,9 +19,9 @@ public class WhereTest : ReactiveTest [Fact] public void Where_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).Where(DummyFunc.Instance)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Where((Func)null)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Where(DummyFunc.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ((IObservable)null).Where(DummyFunc.Instance)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Where((Func)null)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Where(DummyFunc.Instance).Subscribe(null)); } private static bool IsPrime(int i) @@ -465,9 +465,9 @@ public void WhereWhereOptimization_SecondPredicateThrows() [Fact] public void WhereIndex_ArgumentChecking() { - ReactiveAssert.Throws(() => ((IObservable)null).Where(DummyFunc.Instance)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Where((Func)null)); - ReactiveAssert.Throws(() => DummyObservable.Instance.Where(DummyFunc.Instance).Subscribe(null)); + ReactiveAssert.Throws(() => ((IObservable)null).Where(DummyFunc.Instance)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Where((Func)null)); + ReactiveAssert.Throws(() => DummyObservable.Instance.Where(DummyFunc.Instance).Subscribe(null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ZipTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ZipTest.cs index 5be27124a5..4a0cd1eed6 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ZipTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ZipTest.cs @@ -28,10 +28,10 @@ public void Zip_ArgumentChecking() ReactiveAssert.Throws(() => Observable.Zip(someObservable, someObservable, null)); ReactiveAssert.Throws(() => Observable.Zip(null, someObservable, (_, __) => 0)); - ReactiveAssert.Throws(() => Observable.Zip(someObservable, default(IObservable), (_, __) => 0)); + ReactiveAssert.Throws(() => Observable.Zip(someObservable, default(IObservable), (_, __) => 0)); ReactiveAssert.Throws(() => Observable.Zip(someObservable, someEnumerable, null)); ReactiveAssert.Throws(() => Observable.Zip(null, someEnumerable, (_, __) => 0)); - ReactiveAssert.Throws(() => Observable.Zip(someObservable, default(IEnumerable), (_, __) => 0)); + ReactiveAssert.Throws(() => Observable.Zip(someObservable, default(IEnumerable), (_, __) => 0)); } [Fact] @@ -2831,7 +2831,7 @@ public void Zip_GetEnumeratorThrows() var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 42), OnNext(220, 43), OnCompleted(230) @@ -2868,7 +2868,7 @@ public void Zip_AllCompleted2() ); res.Messages.AssertEqual( - OnNext(210, 10), + OnNext(210, 10), OnCompleted(220) ); @@ -2899,7 +2899,7 @@ public void Zip_AllCompleted3() ); res.Messages.AssertEqual( - OnNext(210, 15), + OnNext(210, 15), OnCompleted(230) ); @@ -2931,7 +2931,7 @@ public void Zip_AllCompleted4() ); res.Messages.AssertEqual( - OnNext(210, 20), + OnNext(210, 20), OnCompleted(240) ); @@ -2964,7 +2964,7 @@ public void Zip_AllCompleted5() ); res.Messages.AssertEqual( - OnNext(210, 25), + OnNext(210, 25), OnCompleted(250) ); @@ -2998,7 +2998,7 @@ public void Zip_AllCompleted6() ); res.Messages.AssertEqual( - OnNext(210, 30), + OnNext(210, 30), OnCompleted(260) ); @@ -3033,7 +3033,7 @@ public void Zip_AllCompleted7() ); res.Messages.AssertEqual( - OnNext(210, 35), + OnNext(210, 35), OnCompleted(270) ); @@ -3069,7 +3069,7 @@ public void Zip_AllCompleted8() ); res.Messages.AssertEqual( - OnNext(210, 40), + OnNext(210, 40), OnCompleted(280) ); @@ -3106,7 +3106,7 @@ public void Zip_AllCompleted9() ); res.Messages.AssertEqual( - OnNext(210, 45), + OnNext(210, 45), OnCompleted(290) ); @@ -3144,7 +3144,7 @@ public void Zip_AllCompleted10() ); res.Messages.AssertEqual( - OnNext(210, 50), + OnNext(210, 50), OnCompleted(300) ); @@ -3183,7 +3183,7 @@ public void Zip_AllCompleted11() ); res.Messages.AssertEqual( - OnNext(210, 55), + OnNext(210, 55), OnCompleted(310) ); @@ -3223,7 +3223,7 @@ public void Zip_AllCompleted12() ); res.Messages.AssertEqual( - OnNext(210, 60), + OnNext(210, 60), OnCompleted(320) ); @@ -3264,7 +3264,7 @@ public void Zip_AllCompleted13() ); res.Messages.AssertEqual( - OnNext(210, 65), + OnNext(210, 65), OnCompleted(330) ); @@ -3306,7 +3306,7 @@ public void Zip_AllCompleted14() ); res.Messages.AssertEqual( - OnNext(210, 70), + OnNext(210, 70), OnCompleted(340) ); @@ -3349,7 +3349,7 @@ public void Zip_AllCompleted15() ); res.Messages.AssertEqual( - OnNext(210, 75), + OnNext(210, 75), OnCompleted(350) ); @@ -3393,7 +3393,7 @@ public void Zip_AllCompleted16() ); res.Messages.AssertEqual( - OnNext(210, 80), + OnNext(210, 80), OnCompleted(360) ); @@ -4201,8 +4201,8 @@ public void Zip_NAry_Symmetric_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), - OnNext(260, new[] { 4, 5, 6 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(260, new[] { 4, 5, 6 }.Sum()), OnCompleted(420) ); @@ -4265,8 +4265,8 @@ public void Zip_NAry_Asymmetric_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), - OnNext(260, new[] { 4, 5, 6 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(260, new[] { 4, 5, 6 }.Sum()), OnCompleted(310) ); @@ -4332,7 +4332,7 @@ public void Zip_NAry_Error_Selector() ); res.Messages.AssertEqual( - OnNext(230, new[] { 1, 2, 3 }.Sum()), + OnNext(230, new[] { 1, 2, 3 }.Sum()), OnError(250, ex) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs index 277cff1c57..16c496b757 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs @@ -195,12 +195,12 @@ public IObservable Empty() public IObservable Return(int value) { - return Observable.Return(value).Remotable(); + return Observable.Return(value).Remotable(); } public IObservable ReturnLongLease(int value) { - return Observable.Return(value).Remotable(null); + return Observable.Return(value).Remotable(null); } public IObservable Throw(Exception ex) @@ -219,4 +219,4 @@ public IObservable Disposal() public bool Disposed { get; set; } } } -#endif \ No newline at end of file +#endif diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs index a5f99e2856..8fe17f30e7 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs @@ -18,8 +18,8 @@ public partial class ObservableSafetyTest : ReactiveTest [Fact] public void SubscribeSafe_ArgumentChecking() { - ReactiveAssert.Throws(() => ObservableExtensions.SubscribeSafe(default, Observer.Create(_ => { }))); - ReactiveAssert.Throws(() => ObservableExtensions.SubscribeSafe(Observable.Return(42), default)); + ReactiveAssert.Throws(() => ObservableExtensions.SubscribeSafe(default, Observer.Create(_ => { }))); + ReactiveAssert.Throws(() => ObservableExtensions.SubscribeSafe(Observable.Return(42), default)); } [Fact] @@ -45,7 +45,7 @@ public void Safety_Subscription2() var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 42), OnNext(220, 43), OnNext(230, 44), @@ -165,13 +165,13 @@ public void Producer_ObserverThrows() var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3) ); - var ys = scheduler.CreateHotObservable( + var ys = scheduler.CreateHotObservable( OnNext(215, 1), OnNext(225, 2), OnNext(235, 3) @@ -218,13 +218,13 @@ public void Producer_ObserverThrows_CustomObserver() var scheduler = new TestScheduler(); - var xs = scheduler.CreateHotObservable( + var xs = scheduler.CreateHotObservable( OnNext(210, 1), OnNext(220, 2), OnNext(230, 3) ); - var ys = scheduler.CreateHotObservable( + var ys = scheduler.CreateHotObservable( OnNext(215, 1), OnNext(225, 2), OnNext(235, 3) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs index 72bc5ed948..086e00c256 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs @@ -234,9 +234,9 @@ public void Cast() public void Catch_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Catch(_qbMy, null)); - ReactiveAssert.Throws(() => Qbservable.Catch(_qbNull, (Exception ex) => null)); - ReactiveAssert.Throws(() => Qbservable.Catch(_qbMy, _qbNull)); - ReactiveAssert.Throws(() => Qbservable.Catch(_qbNull, _qbMy)); + ReactiveAssert.Throws(() => Qbservable.Catch(_qbNull, (Exception ex) => null)); + ReactiveAssert.Throws(() => Qbservable.Catch(_qbMy, _qbNull)); + ReactiveAssert.Throws(() => Qbservable.Catch(_qbNull, _qbMy)); ReactiveAssert.Throws(() => Qbservable.Catch(default(IQbservableProvider), _qbMy)); ReactiveAssert.Throws(() => Qbservable.Catch(_qbp, default(IQbservable[]))); ReactiveAssert.Throws(() => Qbservable.Catch(default, new MyQueryable>())); @@ -316,7 +316,7 @@ public void Concat() public void Create_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Create(null, o => default(Action))); - ReactiveAssert.Throws(() => Qbservable.Create(_qbp, default(Expression, Action>>))); + ReactiveAssert.Throws(() => Qbservable.Create(_qbp, default(Expression, Action>>))); } [Fact] @@ -329,7 +329,7 @@ public void Create() public void CreateWithDisposable_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Create(null, o => default(IDisposable))); - ReactiveAssert.Throws(() => Qbservable.Create(_qbp, default(Expression, IDisposable>>))); + ReactiveAssert.Throws(() => Qbservable.Create(_qbp, default(Expression, IDisposable>>))); } [Fact] @@ -342,13 +342,13 @@ public void CreateWithDisposable() public void Defer_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Defer(null, () => _qbMy)); - ReactiveAssert.Throws(() => Qbservable.Defer(_qbp, default(Expression>>))); + ReactiveAssert.Throws(() => Qbservable.Defer(_qbp, default(Expression>>))); } [Fact] public void Defer() { - _qbp.Defer(() => _qbMy); + _qbp.Defer(() => _qbMy); } [Fact] @@ -687,8 +687,8 @@ public void Materialize() public void Max_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Max(null)); - ReactiveAssert.Throws(() => Qbservable.Max(null, Comparer.Default)); - ReactiveAssert.Throws(() => Qbservable.Max(new MyQbservable(), default(IComparer))); + ReactiveAssert.Throws(() => Qbservable.Max(null, Comparer.Default)); + ReactiveAssert.Throws(() => Qbservable.Max(new MyQbservable(), default(IComparer))); ReactiveAssert.Throws(() => Qbservable.Max(default(IQbservable))); ReactiveAssert.Throws(() => Qbservable.Max(default(IQbservable))); ReactiveAssert.Throws(() => Qbservable.Max(default(IQbservable))); @@ -772,8 +772,8 @@ public void Merge() public void Min_ArgumentNullChecks() { ReactiveAssert.Throws(() => Qbservable.Min(null)); - ReactiveAssert.Throws(() => Qbservable.Min(null, Comparer.Default)); - ReactiveAssert.Throws(() => Qbservable.Min(new MyQbservable(), default(IComparer))); + ReactiveAssert.Throws(() => Qbservable.Min(null, Comparer.Default)); + ReactiveAssert.Throws(() => Qbservable.Min(new MyQbservable(), default(IComparer))); ReactiveAssert.Throws(() => Qbservable.Min(default(IQbservable))); ReactiveAssert.Throws(() => Qbservable.Min(default(IQbservable))); ReactiveAssert.Throws(() => Qbservable.Min(default(IQbservable))); @@ -1210,7 +1210,7 @@ public void Sum() [Fact] public void Switch_ArgumentNullChecks() { - ReactiveAssert.Throws(() => Qbservable.Switch(default(IQbservable>))); + ReactiveAssert.Throws(() => Qbservable.Switch(default(IQbservable>))); } [Fact] @@ -1909,7 +1909,7 @@ public static IQbservable Foo(this IQbservable source, Expression( Expression.Call( - ((MethodInfo)MethodInfo.GetCurrentMethod()).MakeGenericMethod(typeof(T), typeof(R)), + ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(T), typeof(R)), source.Expression, f ) @@ -1926,7 +1926,7 @@ public static IQbservable Bar(this IQbservable source) { return source.Provider.CreateQuery( Expression.Call( - (MethodInfo)MethodInfo.GetCurrentMethod(), + (MethodInfo)MethodBase.GetCurrentMethod(), source.Expression ) ); @@ -1943,7 +1943,7 @@ public static IQbservable Qux(this IQbservableProvider provider, T value) { return provider.CreateQuery( Expression.Call( - ((MethodInfo)MethodInfo.GetCurrentMethod()).MakeGenericMethod(typeof(T)), + ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(T)), Expression.Constant(provider, typeof(IQbservableProvider)), Expression.Constant(value, typeof(T)) ) @@ -1961,7 +1961,7 @@ public static IQbservable Baz(this IQbservable source, Expression( Expression.Call( - ((MethodInfo)MethodInfo.GetCurrentMethod()).MakeGenericMethod(typeof(T), typeof(R)), + ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(T), typeof(R)), source.Expression, f ) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs index 9c5413dc81..accaacb14e 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs @@ -425,16 +425,16 @@ public void GetResult_Context() e.WaitOne(); - Assert.True(ctx.ran); + Assert.True(ctx.Ran); } private class MyContext : SynchronizationContext { - public bool ran; + public bool Ran; public override void Post(SendOrPostCallback d, object state) { - ran = true; + Ran = true; d(state); } } diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs index 6aa95ed891..30086fa053 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs @@ -2026,7 +2026,7 @@ private IEnumerable>> FastImmediateObserverTest(Actio var l = 0L; var o = Observer.Create( - x => { ns.Add(OnNext(l++, x)); }, + x => { ns.Add(OnNext(l++, x)); }, ex => { ns.Add(OnError(l++, ex)); }, () => { ns.Add(OnCompleted(l++)); } ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs index 57882f168e..476d523901 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs @@ -370,8 +370,8 @@ public void Subject_Create_ArgumentChecking() ReactiveAssert.Throws(() => Subject.Create(null, Observable.Return(42))); ReactiveAssert.Throws(() => Subject.Create(Observer.Create(x => { }), null)); - ReactiveAssert.Throws(() => Subject.Create(null, Observable.Return(42))); - ReactiveAssert.Throws(() => Subject.Create(Observer.Create(x => { }), null)); + ReactiveAssert.Throws(() => Subject.Create(null, Observable.Return(42))); + ReactiveAssert.Throws(() => Subject.Create(Observer.Create(x => { }), null)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ListObservableTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ListObservableTest.cs index 82bbb7df92..c3e11bd160 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ListObservableTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ListObservableTest.cs @@ -355,7 +355,7 @@ public void Subscribe_Infinite() { var s = new TestScheduler(); - var xs = s.CreateHotObservable( + var xs = s.CreateHotObservable( OnNext(300, 1) ); @@ -372,7 +372,7 @@ public void Subscribe_Error() var ex = new Exception(); - var xs = s.CreateHotObservable( + var xs = s.CreateHotObservable( OnNext(300, 1), OnError(400, ex) ); @@ -380,7 +380,7 @@ public void Subscribe_Error() var results = s.Start(() => new ListObservable(xs)); results.Messages.AssertEqual( - OnError(400, ex) + OnError(400, ex) ); } @@ -389,7 +389,7 @@ public void Subscribe_Completed() { var s = new TestScheduler(); - var xs = s.CreateHotObservable( + var xs = s.CreateHotObservable( OnNext(300, 1), OnCompleted(400) ); @@ -397,7 +397,7 @@ public void Subscribe_Completed() var results = s.Start(() => new ListObservable(xs)); results.Messages.AssertEqual( - OnCompleted(400) + OnCompleted(400) ); } @@ -406,7 +406,7 @@ public void Subscribe_Disposed() { var s = new TestScheduler(); - var xs = s.CreateHotObservable( + var xs = s.CreateHotObservable( OnNext(300, 1), OnCompleted(1100) ); @@ -422,7 +422,7 @@ public void Subscribe_Disposed_Multi() { var s = new TestScheduler(); - var xs = s.CreateHotObservable( + var xs = s.CreateHotObservable( OnNext(300, 1), OnCompleted(400) ); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/NotificationTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/NotificationTest.cs index 4272510bfd..311e72de42 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/NotificationTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/NotificationTest.cs @@ -18,7 +18,7 @@ public class NotificationTest : ReactiveTest [Fact] public void ToObservable_ArgumentChecking() { - ReactiveAssert.Throws(() => Notification.CreateOnNext(1).ToObservable(null)); + ReactiveAssert.Throws(() => Notification.CreateOnNext(1).ToObservable(null)); } [Fact] @@ -41,11 +41,11 @@ public void ToObservable_Return() var scheduler = new TestScheduler(); var res = scheduler.Start(() => - Notification.CreateOnNext(42).ToObservable(scheduler) + Notification.CreateOnNext(42).ToObservable(scheduler) ); res.Messages.AssertEqual( - OnNext(201, 42), + OnNext(201, 42), OnCompleted(201) ); } @@ -104,7 +104,7 @@ public void Notifications_Equality() [Fact] public void OnNext_CtorAndProps() { - var n = Notification.CreateOnNext(42); + var n = Notification.CreateOnNext(42); Assert.Equal(NotificationKind.OnNext, n.Kind); Assert.True(n.HasValue); Assert.Equal(42, n.Value); @@ -114,9 +114,9 @@ public void OnNext_CtorAndProps() [Fact] public void OnNext_Equality() { - var n1 = Notification.CreateOnNext(42); - var n2 = Notification.CreateOnNext(42); - var n3 = Notification.CreateOnNext(24); + var n1 = Notification.CreateOnNext(42); + var n2 = Notification.CreateOnNext(42); + var n3 = Notification.CreateOnNext(24); var n4 = Notification.CreateOnCompleted(); Assert.True(n1.Equals(n1)); @@ -144,8 +144,8 @@ public void OnNext_Equality() [Fact] public void OnNext_GetHashCode() { - var n1 = Notification.CreateOnNext(42); - var n2 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); + var n2 = Notification.CreateOnNext(42); Assert.NotEqual(0, n1.GetHashCode()); Assert.Equal(n1.GetHashCode(), n2.GetHashCode()); @@ -154,7 +154,7 @@ public void OnNext_GetHashCode() [Fact] public void OnNext_ToString() { - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); Assert.True(n1.ToString().Contains("OnNext")); Assert.True(n1.ToString().Contains(42.ToString())); } @@ -163,7 +163,7 @@ public void OnNext_ToString() public void OnNext_AcceptObserver() { var con = new CheckOnNextObserver(); - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); n1.Accept(con); Assert.Equal(42, con.Value); @@ -192,7 +192,7 @@ public void OnCompleted() [Fact] public void OnNext_AcceptObserverWithResult() { - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); var res = n1.Accept(new AcceptObserver(x => "OK", _ => { Assert.True(false); return null; }, () => { Assert.True(false); return null; })); Assert.Equal("OK", res); @@ -201,7 +201,7 @@ public void OnNext_AcceptObserverWithResult() [Fact] public void OnNext_AcceptObserverWithResult_Null() { - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); ReactiveAssert.Throws(() => n1.Accept(default(IObserver))); } @@ -210,7 +210,7 @@ public void OnNext_AcceptAction() { var obs = false; - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); n1.Accept(x => { obs = true; }, _ => { Assert.True(false); }, () => { Assert.True(false); }); Assert.True(obs); @@ -219,7 +219,7 @@ public void OnNext_AcceptAction() [Fact] public void OnNext_Accept_ArgumentChecking() { - var n = Notification.CreateOnNext(42); + var n = Notification.CreateOnNext(42); ReactiveAssert.Throws(() => n.Accept(default)); @@ -227,15 +227,15 @@ public void OnNext_Accept_ArgumentChecking() ReactiveAssert.Throws(() => n.Accept(x => { }, default, () => { })); ReactiveAssert.Throws(() => n.Accept(x => { }, ex => { }, default)); - ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); + ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); } [Fact] public void OnNext_AcceptActionWithResult() { - var n1 = Notification.CreateOnNext(42); + var n1 = Notification.CreateOnNext(42); var res = n1.Accept(x => "OK", _ => { Assert.True(false); return null; }, () => { Assert.True(false); return null; }); Assert.Equal("OK", res); @@ -258,9 +258,9 @@ public void OnError_Accept_ArgumentChecking() ReactiveAssert.Throws(() => n.Accept(x => { }, default, () => { })); ReactiveAssert.Throws(() => n.Accept(x => { }, ex => { }, default)); - ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); + ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); } [Fact] @@ -446,9 +446,9 @@ public void OnCompleted_Accept_ArgumentChecking() ReactiveAssert.Throws(() => n.Accept(x => { }, default, () => { })); ReactiveAssert.Throws(() => n.Accept(x => { }, ex => { }, default)); - ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); - ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); + ReactiveAssert.Throws(() => n.Accept(default, ex => "", () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", default, () => "")); + ReactiveAssert.Throws(() => n.Accept(x => "", ex => "", default)); } [Fact] @@ -456,7 +456,7 @@ public void OnCompleted_Equality() { var n1 = Notification.CreateOnCompleted(); var n2 = Notification.CreateOnCompleted(); - var n3 = Notification.CreateOnNext(2); + var n3 = Notification.CreateOnNext(2); Assert.True(n1.Equals(n1)); Assert.True(n1.Equals(n2)); diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ObserverTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ObserverTest.cs index eaac3c0762..3f304cfc4b 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ObserverTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/ObserverTest.cs @@ -20,7 +20,7 @@ public partial class ObserverTest : ReactiveTest [Fact] public void ToObserver_ArgumentChecking() { - ReactiveAssert.Throws(() => Observer.ToObserver(default(Action>))); + ReactiveAssert.Throws(() => Observer.ToObserver(default(Action>))); } [Fact] @@ -77,7 +77,7 @@ public void ToNotifier_ArgumentChecking() public void ToNotifier_Forwards() { var obsn = new MyObserver(); - obsn.ToNotifier()(Notification.CreateOnNext(42)); + obsn.ToNotifier()(Notification.CreateOnNext(42)); Assert.Equal(obsn.HasOnNext, 42); var ex = new Exception(); @@ -248,7 +248,7 @@ public void AsObserver_Hides() var obs = new MyObserver(); var res = obs.AsObserver(); - Assert.False(object.ReferenceEquals(obs, res)); + Assert.False(ReferenceEquals(obs, res)); } [Fact] @@ -836,7 +836,7 @@ public void Observer_ToProgress_ArgumentChecking() ReactiveAssert.Throws(() => Observer.ToProgress(default)); ReactiveAssert.Throws(() => Observer.ToProgress(default, s)); - ReactiveAssert.Throws(() => Observer.ToProgress(o, default)); + ReactiveAssert.Throws(() => Observer.ToProgress(o, default)); } [Fact] diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/PrivateTypesTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/PrivateTypesTest.cs index 92d2591e46..6c835ff285 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/PrivateTypesTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/PrivateTypesTest.cs @@ -113,12 +113,12 @@ public void EitherSwitchFunc() { var value = 42; var left = (Either.Left)Either.CreateLeft(value); - Assert.Equal(left.Switch(l => l, r => r.Length), value); + Assert.Equal(left.Switch(l => l, r => r.Length), value); } { var value = "42"; var right = (Either.Right)Either.CreateRight(value); - Assert.Equal(right.Switch(l => l, r => r.Length), value.Length); + Assert.Equal(right.Switch(l => l, r => r.Length), value.Length); } } @@ -170,7 +170,7 @@ public static Either CreateLeft(TLeft value) var tpe = typeof(Observable).GetTypeInfo().Assembly.GetTypes().Single(t => t.Name == "Either`2").MakeGenericType(typeof(TLeft), typeof(TRight)); var mth = tpe.GetMethod(nameof(CreateLeft)); var res = mth.Invoke(null, new object[] { value }); - return new Either.Left(res); + return new Left(res); } public static Either CreateRight(TRight value) @@ -178,7 +178,7 @@ public static Either CreateRight(TRight value) var tpe = typeof(Observable).GetTypeInfo().Assembly.GetTypes().Single(t => t.Name == "Either`2").MakeGenericType(typeof(TLeft), typeof(TRight)); var mth = tpe.GetMethod(nameof(CreateRight)); var res = mth.Invoke(null, new object[] { value }); - return new Either.Right(res); + return new Right(res); } public TResult Switch(Func caseLeft, Func caseRight) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/SystemClockTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/SystemClockTest.cs index cd1dd5aae9..84e1c3b650 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/SystemClockTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/SystemClockTest.cs @@ -5,7 +5,6 @@ #if !NO_REMOTING && !XUNIT using System; using System.Collections.Generic; -using System.IO; using System.Reactive; using System.Reactive.Concurrency; using System.Reactive.Disposables; diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs index 1398105499..a85dc8795a 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs @@ -17,13 +17,13 @@ namespace ReactiveTests.Tests public class TaskObservableExtensionsTest : ReactiveTest { - private readonly Task doneTask; + private readonly Task _doneTask; public TaskObservableExtensionsTest() { var tcs = new TaskCompletionSource(); tcs.SetResult(42); - doneTask = tcs.Task; + _doneTask = tcs.Task; } #region ToObservable @@ -36,9 +36,9 @@ public void TaskToObservable_NonVoid_ArgumentChecking() ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable((Task)null)); ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable((Task)null, s)); - ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable(doneTask, default)); + ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable(_doneTask, default)); - var tcs = new System.Threading.Tasks.TaskCompletionSource(); + var tcs = new TaskCompletionSource(); var task = tcs.Task; ReactiveAssert.Throws(() => task.ToObservable().Subscribe(null)); } @@ -396,10 +396,10 @@ public void TaskToObservable_Void_ArgumentChecking() ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable(null)); ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable(null, s)); - ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable((Task)doneTask, default)); + ReactiveAssert.Throws(() => TaskObservableExtensions.ToObservable((Task)_doneTask, default)); - var tcs = new System.Threading.Tasks.TaskCompletionSource(); - System.Threading.Tasks.Task task = tcs.Task; + var tcs = new TaskCompletionSource(); + Task task = tcs.Task; ReactiveAssert.Throws(() => task.ToObservable().Subscribe(null)); }