Skip to content

Commit 4fac467

Browse files
committed
fix variable names
1 parent 610f639 commit 4fac467

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

Src/FluentAssertions.Reactive/FluentTestObserver.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ namespace FluentAssertions.Reactive
1717
/// <typeparam name="TPayload"></typeparam>
1818
public class FluentTestObserver<TPayload> : IObserver<TPayload>, IDisposable
1919
{
20-
private readonly IDisposable _subscription;
21-
private readonly IScheduler _observeScheduler;
22-
private readonly RollingReplaySubject<Recorded<Notification<TPayload>>> _rollingReplaySubject = new RollingReplaySubject<Recorded<Notification<TPayload>>>();
20+
private readonly IDisposable subscription;
21+
private readonly IScheduler observeScheduler;
22+
private readonly RollingReplaySubject<Recorded<Notification<TPayload>>> rollingReplaySubject = new RollingReplaySubject<Recorded<Notification<TPayload>>>();
2323

2424
/// <summary>
2525
/// The observable which is observed by this instance
@@ -29,13 +29,13 @@ public class FluentTestObserver<TPayload> : IObserver<TPayload>, IDisposable
2929
/// <summary>
3030
/// The stream of recorded <see cref="Notification{T}"/>s
3131
/// </summary>
32-
public IObservable<Recorded<Notification<TPayload>>> RecordedNotificationStream => _rollingReplaySubject.AsObservable();
32+
public IObservable<Recorded<Notification<TPayload>>> RecordedNotificationStream => rollingReplaySubject.AsObservable();
3333

3434
/// <summary>
3535
/// The recorded <see cref="Notification{T}"/>s
3636
/// </summary>
3737
public IEnumerable<Recorded<Notification<TPayload>>> RecordedNotifications =>
38-
_rollingReplaySubject.GetSnapshot();
38+
rollingReplaySubject.GetSnapshot();
3939

4040
/// <summary>
4141
/// The recorded messages
@@ -66,8 +66,8 @@ public class FluentTestObserver<TPayload> : IObserver<TPayload>, IDisposable
6666
public FluentTestObserver(IObservable<TPayload> subject)
6767
{
6868
Subject = subject;
69-
_observeScheduler = new EventLoopScheduler();
70-
_subscription = new CompositeDisposable(); subject.ObserveOn(_observeScheduler).Subscribe(this);
69+
observeScheduler = new EventLoopScheduler();
70+
subscription = new CompositeDisposable(); subject.ObserveOn(observeScheduler).Subscribe(this);
7171
}
7272

7373
/// <summary>
@@ -77,8 +77,8 @@ public FluentTestObserver(IObservable<TPayload> subject)
7777
public FluentTestObserver(IObservable<TPayload> subject, IScheduler scheduler)
7878
{
7979
Subject = subject;
80-
_observeScheduler = scheduler;
81-
_subscription = subject.ObserveOn(scheduler).Subscribe(this);
80+
observeScheduler = scheduler;
81+
subscription = subject.ObserveOn(scheduler).Subscribe(this);
8282
}
8383

8484
/// <summary>
@@ -88,35 +88,35 @@ public FluentTestObserver(IObservable<TPayload> subject, IScheduler scheduler)
8888
public FluentTestObserver(IObservable<TPayload> subject, TestScheduler testScheduler)
8989
{
9090
Subject = subject;
91-
_observeScheduler = testScheduler;
92-
_subscription = subject.ObserveOn(Scheduler.CurrentThread).Subscribe(this);
91+
observeScheduler = testScheduler;
92+
subscription = subject.ObserveOn(Scheduler.CurrentThread).Subscribe(this);
9393
}
9494

9595
/// <summary>
9696
/// Clears the recorded notifications and messages as well as the recorded notifications stream buffer
9797
/// </summary>
98-
public void Clear() => _rollingReplaySubject.Clear();
98+
public void Clear() => rollingReplaySubject.Clear();
9999

100100
/// <inheritdoc />
101101
public void OnNext(TPayload value)
102102
{
103-
_rollingReplaySubject.OnNext(
104-
new Recorded<Notification<TPayload>>(_observeScheduler.Now.UtcTicks, Notification.CreateOnNext(value)));
103+
rollingReplaySubject.OnNext(
104+
new Recorded<Notification<TPayload>>(observeScheduler.Now.UtcTicks, Notification.CreateOnNext(value)));
105105
}
106106

107107
/// <inheritdoc />
108108
public void OnError(Exception exception) =>
109-
_rollingReplaySubject.OnNext(new Recorded<Notification<TPayload>>(_observeScheduler.Now.UtcTicks, Notification.CreateOnError<TPayload>(exception)));
109+
rollingReplaySubject.OnNext(new Recorded<Notification<TPayload>>(observeScheduler.Now.UtcTicks, Notification.CreateOnError<TPayload>(exception)));
110110

111111
/// <inheritdoc />
112112
public void OnCompleted() =>
113-
_rollingReplaySubject.OnNext(new Recorded<Notification<TPayload>>(_observeScheduler.Now.UtcTicks, Notification.CreateOnCompleted<TPayload>()));
113+
rollingReplaySubject.OnNext(new Recorded<Notification<TPayload>>(observeScheduler.Now.UtcTicks, Notification.CreateOnCompleted<TPayload>()));
114114

115115
/// <inheritdoc />
116116
public void Dispose()
117117
{
118-
_subscription?.Dispose();
119-
_rollingReplaySubject?.Dispose();
118+
subscription?.Dispose();
119+
rollingReplaySubject?.Dispose();
120120
}
121121

122122
/// <summary>

Src/FluentAssertions.Reactive/RollingReplaySubject.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ namespace FluentAssertions.Reactive
1111
/// <typeparam name="T"></typeparam>
1212
public class RollingReplaySubject<T> : ISubject<T>, IDisposable
1313
{
14-
private readonly ReplaySubject<IObservable<T>> _subjects;
15-
private readonly IObservable<T> _concatenatedSubjects;
16-
private ISubject<T> _currentSubject;
14+
private readonly ReplaySubject<IObservable<T>> subjects;
15+
private readonly IObservable<T> concatenatedSubjects;
16+
private ISubject<T> currentSubject;
1717

1818
public RollingReplaySubject()
1919
{
20-
_subjects = new ReplaySubject<IObservable<T>>(1);
21-
_concatenatedSubjects = _subjects.Concat();
22-
_currentSubject = new ReplaySubject<T>();
23-
_subjects.OnNext(_currentSubject);
20+
subjects = new ReplaySubject<IObservable<T>>(1);
21+
concatenatedSubjects = subjects.Concat();
22+
currentSubject = new ReplaySubject<T>();
23+
subjects.OnNext(currentSubject);
2424
}
2525

2626
public void Clear()
2727
{
28-
_currentSubject.OnCompleted();
29-
_currentSubject = new ReplaySubject<T>();
30-
_subjects.OnNext(_currentSubject);
28+
currentSubject.OnCompleted();
29+
currentSubject = new ReplaySubject<T>();
30+
subjects.OnNext(currentSubject);
3131
}
3232

33-
public void OnNext(T value) => _currentSubject.OnNext(value);
33+
public void OnNext(T value) => currentSubject.OnNext(value);
3434

35-
public void OnError(Exception error) => _currentSubject.OnError(error);
35+
public void OnError(Exception error) => currentSubject.OnError(error);
3636

3737
public void OnCompleted()
3838
{
39-
_currentSubject.OnCompleted();
40-
_subjects.OnCompleted();
39+
currentSubject.OnCompleted();
40+
subjects.OnCompleted();
4141
// a quick way to make the current ReplaySubject unreachable
4242
// except to in-flight observers, and not hold up collection
43-
_currentSubject = new Subject<T>();
43+
currentSubject = new Subject<T>();
4444
}
4545

46-
public IDisposable Subscribe(IObserver<T> observer) => _concatenatedSubjects.Subscribe(observer);
46+
public IDisposable Subscribe(IObserver<T> observer) => concatenatedSubjects.Subscribe(observer);
4747

4848
public IEnumerable<T> GetSnapshot()
4949
{
@@ -58,7 +58,7 @@ public IEnumerable<T> GetSnapshot()
5858
public void Dispose()
5959
{
6060
OnCompleted();
61-
_subjects?.Dispose();
61+
subjects?.Dispose();
6262
}
6363
}
6464
}

0 commit comments

Comments
 (0)