From 1dbb9343a75115ab3b0ba3e65734ce1faceab279 Mon Sep 17 00:00:00 2001 From: freak4pc Date: Wed, 24 Apr 2019 23:14:50 +0300 Subject: [PATCH] Tests: Rename O to Observer when applicable --- .../Mocks/BackgroundThreadPrimitiveHotObservable.swift | 2 +- .../Mocks/MainThreadPrimitiveHotObservable.swift | 2 +- Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift | 2 +- .../TestImplementations/Mocks/PrimitiveHotObservable.swift | 2 +- .../TestImplementations/Mocks/TestConnectableObservable.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift index e0069539..08aa291b 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift @@ -11,7 +11,7 @@ import XCTest import Dispatch final class BackgroundThreadPrimitiveHotObservable : PrimitiveHotObservable { - override func subscribe(_ observer: O) -> Disposable where O.Element == Element { + override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element { XCTAssertTrue(!DispatchQueue.isMain) return super.subscribe(observer) } diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift index 7106bfe5..ba764f5d 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift @@ -11,7 +11,7 @@ import XCTest import Dispatch final class MainThreadPrimitiveHotObservable : PrimitiveHotObservable { - override func subscribe(_ observer: O) -> Disposable where O.Element == Element { + override func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element { XCTAssertTrue(DispatchQueue.isMain) return super.subscribe(observer) } diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift index 5bc6251e..280dbed3 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift @@ -39,7 +39,7 @@ final class MySubject : SubjectType, ObserverType where Element : Hasha } } - func subscribe(_ observer: O) -> Disposable where O.Element == Element { + func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element { _subscribeCount += 1 _observer = AnyObserver(observer) diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift index ee7fe6a8..fc7a382f 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift @@ -37,7 +37,7 @@ class PrimitiveHotObservable : ObservableType { _observers.on(event) } - func subscribe(_ observer: O) -> Disposable where O.Element == Element { + func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element { lock.lock() defer { lock.unlock() } diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/TestConnectableObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/TestConnectableObservable.swift index 647fc340..2d1ff00d 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/TestConnectableObservable.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/TestConnectableObservable.swift @@ -21,7 +21,7 @@ final class TestConnectableObservable : ConnectableObserva return _o.connect() } - func subscribe(_ observer: O) -> Disposable where O.Element == Element { + func subscribe(_ observer: Observer) -> Disposable where Observer.Element == Element { return _o.subscribe(observer) } }