From cc243d678e9f40703d3636552eb199ea7958f127 Mon Sep 17 00:00:00 2001 From: freak4pc Date: Sun, 6 Jan 2019 08:16:20 +0200 Subject: [PATCH] RxTest & RxBlocking: Force explicit self calls --- RxBlocking/BlockingObservable+Operators.swift | 22 +++++++++---------- RxBlocking/RunLoopLock.swift | 18 +++++++-------- RxTest/Any+Equatable.swift | 8 +++---- RxTest/ColdObservable.swift | 8 +++---- RxTest/Deprecated.swift | 4 ++-- RxTest/HotObservable.swift | 8 +++---- RxTest/Recorded.swift | 2 +- RxTest/Schedulers/TestScheduler.swift | 12 +++++----- .../TestSchedulerVirtualTimeConverter.swift | 10 ++++----- RxTest/Subscription.swift | 6 ++--- RxTest/TestableObserver.swift | 4 ++-- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/RxBlocking/BlockingObservable+Operators.swift b/RxBlocking/BlockingObservable+Operators.swift index 0d9a6d39..2da68829 100644 --- a/RxBlocking/BlockingObservable+Operators.swift +++ b/RxBlocking/BlockingObservable+Operators.swift @@ -28,8 +28,8 @@ extension BlockingObservable { /// /// - returns: All elements of sequence. public func toArray() throws -> [E] { - let results = materializeResult() - return try elementsOrThrow(results) + let results = self.materializeResult() + return try self.elementsOrThrow(results) } } @@ -40,8 +40,8 @@ extension BlockingObservable { /// /// - returns: First element of sequence. If sequence is empty `nil` is returned. public func first() throws -> E? { - let results = materializeResult(max: 1) - return try elementsOrThrow(results).first + let results = self.materializeResult(max: 1) + return try self.elementsOrThrow(results).first } } @@ -52,8 +52,8 @@ extension BlockingObservable { /// /// - returns: Last element in the sequence. If sequence is empty `nil` is returned. public func last() throws -> E? { - let results = materializeResult() - return try elementsOrThrow(results).last + let results = self.materializeResult() + return try self.elementsOrThrow(results).last } } @@ -64,7 +64,7 @@ extension BlockingObservable { /// /// - returns: Returns the only element of an sequence, and reports an error if there is not exactly one element in the observable sequence. public func single() throws -> E { - return try single { _ in true } + return try self.single { _ in true } } /// Blocks current thread until sequence terminates. @@ -74,8 +74,8 @@ extension BlockingObservable { /// - parameter predicate: A function to test each source element for a condition. /// - returns: Returns the only element of an sequence that satisfies the condition in the predicate, and reports an error if there is not exactly one element in the sequence. public func single(_ predicate: @escaping (E) throws -> Bool) throws -> E { - let results = materializeResult(max: 2, predicate: predicate) - let elements = try elementsOrThrow(results) + let results = self.materializeResult(max: 2, predicate: predicate) + let elements = try self.elementsOrThrow(results) if elements.count > 1 { throw RxError.moreThanOneElement @@ -96,7 +96,7 @@ extension BlockingObservable { /// /// - returns: On completion, returns the list of elements in the sequence. On error, returns the list of elements up to that point, along with the error itself. public func materialize() -> MaterializedSequenceResult { - return materializeResult() + return self.materializeResult() } } @@ -105,7 +105,7 @@ extension BlockingObservable { var elements: [E] = Array() var error: Swift.Error? - let lock = RunLoopLock(timeout: timeout) + let lock = RunLoopLock(timeout: self.timeout) let d = SingleAssignmentDisposable() diff --git a/RxBlocking/RunLoopLock.swift b/RxBlocking/RunLoopLock.swift index e2aeb93e..03e30d68 100644 --- a/RxBlocking/RunLoopLock.swift +++ b/RxBlocking/RunLoopLock.swift @@ -27,12 +27,12 @@ final class RunLoopLock { var _timeout: RxTimeInterval? init(timeout: RxTimeInterval?) { - _timeout = timeout - _currentRunLoop = CFRunLoopGetCurrent() + self._timeout = timeout + self._currentRunLoop = CFRunLoopGetCurrent() } func dispatch(_ action: @escaping () -> Void) { - CFRunLoopPerformBlock(_currentRunLoop, runLoopModeRaw) { + CFRunLoopPerformBlock(self._currentRunLoop, runLoopModeRaw) { if CurrentThreadScheduler.isScheduleRequired { _ = CurrentThreadScheduler.instance.schedule(()) { _ in action() @@ -43,24 +43,24 @@ final class RunLoopLock { action() } } - CFRunLoopWakeUp(_currentRunLoop) + CFRunLoopWakeUp(self._currentRunLoop) } func stop() { - if _calledStop.decrement() > 1 { + if self._calledStop.decrement() > 1 { return } - CFRunLoopPerformBlock(_currentRunLoop, runLoopModeRaw) { + CFRunLoopPerformBlock(self._currentRunLoop, runLoopModeRaw) { CFRunLoopStop(self._currentRunLoop) } - CFRunLoopWakeUp(_currentRunLoop) + CFRunLoopWakeUp(self._currentRunLoop) } func run() throws { - if _calledRun.increment() != 0 { + if self._calledRun.increment() != 0 { fatalError("Run can be only called once") } - if let timeout = _timeout { + if let timeout = self._timeout { #if os(Linux) switch Int(CFRunLoopRunInMode(runLoopModeRaw, timeout, false)) { case kCFRunLoopRunFinished: diff --git a/RxTest/Any+Equatable.swift b/RxTest/Any+Equatable.swift index 87e54054..4c3fa1d2 100644 --- a/RxTest/Any+Equatable.swift +++ b/RxTest/Any+Equatable.swift @@ -17,8 +17,8 @@ struct AnyEquatable let _comparer: Comparer init(target: Target, comparer: @escaping Comparer) { - _target = target - _comparer = comparer + self._target = target + self._comparer = comparer } } @@ -30,10 +30,10 @@ extension AnyEquatable : CustomDebugStringConvertible , CustomStringConvertible { var description: String { - return "\(_target)" + return "\(self._target)" } var debugDescription: String { - return "\(_target)" + return "\(self._target)" } } diff --git a/RxTest/ColdObservable.swift b/RxTest/ColdObservable.swift index a886fa3e..97f614fb 100644 --- a/RxTest/ColdObservable.swift +++ b/RxTest/ColdObservable.swift @@ -21,15 +21,15 @@ final class ColdObservable } /// Subscribes `observer` to receive events for this sequence. - override func subscribe(_ observer: O) -> Disposable where O.E == Element { - subscriptions.append(Subscription(testScheduler.clock)) + override func subscribe(_ observer: O) -> Disposable where O.E == Element { + self.subscriptions.append(Subscription(self.testScheduler.clock)) let i = self.subscriptions.count - 1 var disposed = false - for recordedEvent in recordedEvents { - _ = testScheduler.scheduleRelativeVirtual((), dueTime: recordedEvent.time, action: { _ in + for recordedEvent in self.recordedEvents { + _ = self.testScheduler.scheduleRelativeVirtual((), dueTime: recordedEvent.time, action: { _ in if !disposed { observer.on(recordedEvent.value) } diff --git a/RxTest/Deprecated.swift b/RxTest/Deprecated.swift index 1f1313e6..89d3d266 100644 --- a/RxTest/Deprecated.swift +++ b/RxTest/Deprecated.swift @@ -11,12 +11,12 @@ import RxSwift extension TestScheduler { @available(*, deprecated, renamed: "start(disposed:create:)") public func start(_ disposed: TestTime, create: @escaping () -> Observable) -> TestableObserver { - return start(Defaults.created, subscribed: Defaults.subscribed, disposed: disposed, create: create) + return self.start(Defaults.created, subscribed: Defaults.subscribed, disposed: disposed, create: create) } @available(*, deprecated, renamed: "start(created:subscribed:disposed:create:)") public func start(_ created: TestTime, subscribed: TestTime, disposed: TestTime, create: @escaping () -> Observable) -> TestableObserver { - return start(created: created, subscribed: subscribed, disposed: disposed, create: create) + return self.start(created: created, subscribed: subscribed, disposed: disposed, create: create) } } diff --git a/RxTest/HotObservable.swift b/RxTest/HotObservable.swift index e055a572..8855b299 100644 --- a/RxTest/HotObservable.swift +++ b/RxTest/HotObservable.swift @@ -23,7 +23,7 @@ final class HotObservable private var _observers: Observers override init(testScheduler: TestScheduler, recordedEvents: [Recorded>]) { - _observers = Observers() + self._observers = Observers() super.init(testScheduler: testScheduler, recordedEvents: recordedEvents) @@ -37,9 +37,9 @@ final class HotObservable } /// Subscribes `observer` to receive events for this sequence. - override func subscribe(_ observer: O) -> Disposable where O.E == Element { - let key = _observers.insert(observer.on) - subscriptions.append(Subscription(self.testScheduler.clock)) + override func subscribe(_ observer: O) -> Disposable where O.E == Element { + let key = self._observers.insert(observer.on) + self.subscriptions.append(Subscription(self.testScheduler.clock)) let i = self.subscriptions.count - 1 diff --git a/RxTest/Recorded.swift b/RxTest/Recorded.swift index b96fabfa..bae446f5 100644 --- a/RxTest/Recorded.swift +++ b/RxTest/Recorded.swift @@ -28,7 +28,7 @@ public struct Recorded extension Recorded { /// A textual representation of `self`, suitable for debugging. public var debugDescription: String { - return "\(value) @ \(time)" + return "\(self.value) @ \(self.time)" } } diff --git a/RxTest/Schedulers/TestScheduler.swift b/RxTest/Schedulers/TestScheduler.swift index bae5a321..bf14133b 100644 --- a/RxTest/Schedulers/TestScheduler.swift +++ b/RxTest/Schedulers/TestScheduler.swift @@ -31,7 +31,7 @@ public class TestScheduler : VirtualTimeScheduler VirtualTime { - return time <= clock ? clock + (_simulateProcessingDelay ? 1 : 0) : time + return time <= self.clock ? self.clock + (self._simulateProcessingDelay ? 1 : 0) : time } /** @@ -96,7 +96,7 @@ public class TestScheduler : VirtualTimeScheduler(created: TestTime, subscribed: TestTime, disposed: TestTime, create: @escaping () -> Observable) -> TestableObserver { var source: Observable? var subscription: Disposable? - let observer = createObserver(Element.self) + let observer = self.createObserver(Element.self) _ = self.scheduleAbsoluteVirtual((), time: created) { _ in source = create() @@ -113,7 +113,7 @@ public class TestScheduler : VirtualTimeScheduler(disposed: TestTime, create: @escaping () -> Observable) -> TestableObserver { - return start(created: Defaults.created, subscribed: Defaults.subscribed, disposed: disposed, create: create) + return self.start(created: Defaults.created, subscribed: Defaults.subscribed, disposed: disposed, create: create) } /** @@ -145,7 +145,7 @@ public class TestScheduler : VirtualTimeScheduler(_ create: @escaping () -> Observable) -> TestableObserver { - return start(created: Defaults.created, subscribed: Defaults.subscribed, disposed: Defaults.disposed, create: create) + return self.start(created: Defaults.created, subscribed: Defaults.subscribed, disposed: Defaults.disposed, create: create) } } diff --git a/RxTest/Schedulers/TestSchedulerVirtualTimeConverter.swift b/RxTest/Schedulers/TestSchedulerVirtualTimeConverter.swift index 196aac77..8711b09f 100644 --- a/RxTest/Schedulers/TestSchedulerVirtualTimeConverter.swift +++ b/RxTest/Schedulers/TestSchedulerVirtualTimeConverter.swift @@ -20,7 +20,7 @@ public struct TestSchedulerVirtualTimeConverter : VirtualTimeConverterType { private let _resolution: Double init(resolution: Double) { - _resolution = resolution + self._resolution = resolution } @@ -29,7 +29,7 @@ public struct TestSchedulerVirtualTimeConverter : VirtualTimeConverterType { /// - parameter virtualTime: Virtual time to convert to `Date`. /// - returns: `Date` corresponding to virtual time. public func convertFromVirtualTime(_ virtualTime: VirtualTimeUnit) -> RxTime { - return Date(timeIntervalSince1970: RxTimeInterval(virtualTime) * _resolution) + return Date(timeIntervalSince1970: RxTimeInterval(virtualTime) * self._resolution) } /// Converts real time to virtual time. @@ -37,7 +37,7 @@ public struct TestSchedulerVirtualTimeConverter : VirtualTimeConverterType { /// - parameter time: `Date` to convert to virtual time. /// - returns: Virtual time corresponding to `Date`. public func convertToVirtualTime(_ time: RxTime) -> VirtualTimeUnit { - return VirtualTimeIntervalUnit(time.timeIntervalSince1970 / _resolution + 0.5) + return VirtualTimeIntervalUnit(time.timeIntervalSince1970 / self._resolution + 0.5) } /// Converts from virtual time interval to `NSTimeInterval`. @@ -45,7 +45,7 @@ public struct TestSchedulerVirtualTimeConverter : VirtualTimeConverterType { /// - parameter virtualTimeInterval: Virtual time interval to convert to `NSTimeInterval`. /// - returns: `NSTimeInterval` corresponding to virtual time interval. public func convertFromVirtualTimeInterval(_ virtualTimeInterval: VirtualTimeIntervalUnit) -> RxTimeInterval { - return RxTimeInterval(virtualTimeInterval) * _resolution + return RxTimeInterval(virtualTimeInterval) * self._resolution } /// Converts from virtual time interval to `NSTimeInterval`. @@ -53,7 +53,7 @@ public struct TestSchedulerVirtualTimeConverter : VirtualTimeConverterType { /// - parameter timeInterval: `NSTimeInterval` to convert to virtual time interval. /// - returns: Virtual time interval corresponding to time interval. public func convertToVirtualTimeInterval(_ timeInterval: RxTimeInterval) -> VirtualTimeIntervalUnit { - return VirtualTimeIntervalUnit(timeInterval / _resolution + 0.5) + return VirtualTimeIntervalUnit(timeInterval / self._resolution + 0.5) } /// Adds virtual time and virtual time interval. diff --git a/RxTest/Subscription.swift b/RxTest/Subscription.swift index c91b9c3b..0a7a5c32 100644 --- a/RxTest/Subscription.swift +++ b/RxTest/Subscription.swift @@ -38,8 +38,8 @@ extension Subscription : Hashable , Equatable { /// The hash value. - public var hashValue : Int { - return subscribe.hashValue ^ unsubscribe.hashValue + public var hashValue: Int { + return self.subscribe.hashValue ^ self.unsubscribe.hashValue } } @@ -48,7 +48,7 @@ extension Subscription /// A textual representation of `self`, suitable for debugging. public var debugDescription : String { let infiniteText = "Infinity" - return "(\(subscribe) : \(unsubscribe != Int.max ? String(unsubscribe) : infiniteText))" + return "(\(self.subscribe): \(self.unsubscribe != Int.max ? String(self.unsubscribe) : infiniteText))" } } diff --git a/RxTest/TestableObserver.swift b/RxTest/TestableObserver.swift index f17e6f11..c509bf97 100644 --- a/RxTest/TestableObserver.swift +++ b/RxTest/TestableObserver.swift @@ -19,13 +19,13 @@ public final class TestableObserver public fileprivate(set) var events = [Recorded>]() init(scheduler: TestScheduler) { - _scheduler = scheduler + self._scheduler = scheduler } /// Notify observer about sequence event. /// /// - parameter event: Event that occurred. public func on(_ event: Event) { - events.append(Recorded(time: _scheduler.clock, value: event)) + self.events.append(Recorded(time: self._scheduler.clock, value: event)) } }