Skip to content

Commit

Permalink
Tests: Rename O to Observer when applicable
Browse files Browse the repository at this point in the history
  • Loading branch information
freak4pc authored and kzaher committed Apr 27, 2019
1 parent 05e27bc commit 1dbb934
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Expand Up @@ -11,7 +11,7 @@ import XCTest
import Dispatch import Dispatch


final class BackgroundThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> { final class BackgroundThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element { override func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
XCTAssertTrue(!DispatchQueue.isMain) XCTAssertTrue(!DispatchQueue.isMain)
return super.subscribe(observer) return super.subscribe(observer)
} }
Expand Down
Expand Up @@ -11,7 +11,7 @@ import XCTest
import Dispatch import Dispatch


final class MainThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> { final class MainThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element { override func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
XCTAssertTrue(DispatchQueue.isMain) XCTAssertTrue(DispatchQueue.isMain)
return super.subscribe(observer) return super.subscribe(observer)
} }
Expand Down
Expand Up @@ -39,7 +39,7 @@ final class MySubject<Element> : SubjectType, ObserverType where Element : Hasha
} }
} }


func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element { func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
_subscribeCount += 1 _subscribeCount += 1
_observer = AnyObserver(observer) _observer = AnyObserver(observer)


Expand Down
Expand Up @@ -37,7 +37,7 @@ class PrimitiveHotObservable<Element> : ObservableType {
_observers.on(event) _observers.on(event)
} }


func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element { func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
lock.lock() lock.lock()
defer { lock.unlock() } defer { lock.unlock() }


Expand Down
Expand Up @@ -21,7 +21,7 @@ final class TestConnectableObservable<Subject: SubjectType> : ConnectableObserva
return _o.connect() return _o.connect()
} }


func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element { func subscribe<Observer: ObserverType>(_ observer: Observer) -> Disposable where Observer.Element == Element {
return _o.subscribe(observer) return _o.subscribe(observer)
} }
} }

0 comments on commit 1dbb934

Please sign in to comment.