TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecates versions with hidden external parameter name (scheduler, count ...).

This commit is contained in:
Krunoslav Zaher 2015-12-19 14:30:19 +01:00
parent 85a3e11ef4
commit 637b19947c
15 changed files with 170 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rx.xcodeproj/project.pbxproj
View File

@ -199,7 +199,7 @@
C8093DA61B8A72BE0088E94D /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CC11B8A72BE0088E94D /* SubjectType.swift */; };
C8093DA71B8A72BE0088E94D /* Variable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CC21B8A72BE0088E94D /* Variable.swift */; };
C8093DA81B8A72BE0088E94D /* Variable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093CC21B8A72BE0088E94D /* Variable.swift */; };
C8093ECF1B8A732E0088E94D /* _RX.h in Headers */ = {isa = PBXBuildFile; fileRef = C8093E821B8A732E0088E94D /* _RX.h */; };
C8093ECF1B8A732E0088E94D /* _RX.h in Headers */ = {isa = PBXBuildFile; fileRef = C8093E821B8A732E0088E94D /* _RX.h */; settings = {ATTRIBUTES = (Public, ); }; };
C8093ED11B8A732E0088E94D /* _RX.m in Sources */ = {isa = PBXBuildFile; fileRef = C8093E831B8A732E0088E94D /* _RX.m */; };
C8093ED21B8A732E0088E94D /* _RX.m in Sources */ = {isa = PBXBuildFile; fileRef = C8093E831B8A732E0088E94D /* _RX.m */; };
C8093ED31B8A732E0088E94D /* _RXDelegateProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = C8093E841B8A732E0088E94D /* _RXDelegateProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };

26
RxCocoa/Common/CocoaUnits/Driver/Driver+Operators.swift
View File

@ -277,14 +277,23 @@ extension DriverConvertibleType {
- returns: The throttled sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Driver<E> {
let source = self.asObservable()
.throttle(dueTime, scheduler)
.throttle(dueTime, scheduler: scheduler)
return Driver(source)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Driver<E> {
let source = self.asObservable()
.throttle(dueTime, scheduler: scheduler)
return Driver(source)
}
/**
Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers.
@ -295,10 +304,19 @@ extension DriverConvertibleType {
- returns: The throttled sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Driver<E> {
let source = self.asObservable()
.debounce(dueTime, scheduler: scheduler)
return Driver(source)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Driver<E> {
let source = self.asObservable()
.debounce(dueTime, scheduler)
.debounce(dueTime, scheduler: scheduler)
return Driver(source)
}

1
RxCocoa/RxCocoa.h
View File

@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
#import "_RX.h"
#import "_RXDelegateProxy.h"
#import "_RXKVOObserver.h"
#import "_RXObjCRuntime.h"

2
RxCocoa/iOS/UITextView+Rx.swift
View File

@ -43,7 +43,7 @@ extension UITextView {
// Event needs to happen after text is changed. This is kind of a hacky way, but
// don't know any other way for now.
let throttledAnyOtherEvent = anyOtherEvent
.throttle(0, MainScheduler.sharedInstance)
.throttle(0, scheduler: MainScheduler.sharedInstance)
.takeUntil(self?.rx_deallocated ?? just())
return sequenceOf(textChangedEvent.map { _ in () }, throttledAnyOtherEvent)

2
RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift
View File

@ -53,7 +53,7 @@ class GitHubSearchRepositoriesViewController: ViewController, UITableViewDelegat
}
let searchResult = searchBar.rx_text.asDriver()
.throttle(0.3, $.mainScheduler)
.throttle(0.3, scheduler: $.mainScheduler)
.distinctUntilChanged()
.flatMapLatest { query -> Driver<RepositoriesState> in
if query.isEmpty {

2
RxExample/RxExample/Examples/GitHubSignup/DefaultImplementations.swift
View File

@ -106,7 +106,7 @@ class GitHubDefaultAPI : GitHubAPI {
let signupResult = arc4random() % 5 == 0 ? false : true
return just(signupResult)
.concat(never())
.throttle(2, MainScheduler.sharedInstance)
.throttle(2, scheduler: MainScheduler.sharedInstance)
.take(1)
}
}

2
RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift
View File

@ -47,7 +47,7 @@ class WikipediaSearchViewController: ViewController {
searchBar.rx_text
.asDriver()
.throttle(0.3, scheduler)
.throttle(0.3, scheduler: scheduler)
.distinctUntilChanged()
.flatMapLatest { query in
API.getSearchResults(query)

10
RxSwift/Observables/Observable+Creation.swift
View File

@ -173,6 +173,11 @@ Generates an observable sequence of integral numbers within a specified range, u
- returns: An observable sequence that contains a range of sequential integral numbers.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func range(start: Int, count: Int, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<Int> {
return RangeProducer<Int>(start: start, count: count, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named count, scheduler parameters.")
public func range(start: Int, _ count: Int, _ scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<Int> {
return RangeProducer<Int>(start: start, count: count, scheduler: scheduler)
}
@ -185,6 +190,11 @@ Generates an observable sequence that repeats the given element infinitely, usin
- returns: An observable sequence that repeats the given element infinitely.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func repeatElement<E>(element: E, scheduler: ImmediateSchedulerType) -> Observable<E> {
return RepeatElement(element: element, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func repeatElement<E>(element: E, _ scheduler: ImmediateSchedulerType) -> Observable<E> {
return RepeatElement(element: element, scheduler: scheduler)
}

72
RxSwift/Observables/Observable+Time.swift
View File

@ -21,11 +21,18 @@ extension ObservableType {
- returns: The throttled sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Observable<E> {
return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func throttle<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
}
/**
Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers.
@ -36,6 +43,12 @@ extension ObservableType {
- returns: The throttled sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Observable<E> {
return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func debounce<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return Throttle(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
@ -89,6 +102,15 @@ Returns an observable sequence that produces a value after each period, using th
- returns: An observable sequence that produces a value after each period.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func interval<S: SchedulerType>(period: S.TimeInterval, scheduler: S)
-> Observable<Int64> {
return Timer(dueTime: period,
period: period,
scheduler: scheduler
)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func interval<S: SchedulerType>(period: S.TimeInterval, _ scheduler: S)
-> Observable<Int64> {
return Timer(dueTime: period,
@ -108,6 +130,16 @@ Returns an observable sequence that periodically produces a value after the spec
- returns: An observable sequence that produces a value after due time has elapsed and then each period.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func timer<S: SchedulerType>(dueTime: S.TimeInterval, period: S.TimeInterval, scheduler: S)
-> Observable<Int64> {
return Timer(
dueTime: dueTime,
period: period,
scheduler: scheduler
)
}
@available(*, deprecated=2.0.0, message="Please use version with named period and scheduler parameters.")
public func timer<S: SchedulerType>(dueTime: S.TimeInterval, _ period: S.TimeInterval, _ scheduler: S)
-> Observable<Int64> {
return Timer(
@ -125,6 +157,16 @@ Returns an observable sequence that produces a single value at the specified abs
- returns: An observable sequence that produces a value at due time.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func timer<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Observable<Int64> {
return Timer(
dueTime: dueTime,
period: nil,
scheduler: scheduler
)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func timer<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Observable<Int64> {
return Timer(
@ -146,6 +188,12 @@ extension ObservableType {
- returns: An observable sequence with the elements taken during the specified duration from the start of the source sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func take<S: SchedulerType>(duration: S.TimeInterval, scheduler: S)
-> Observable<E> {
return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func take<S: SchedulerType>(duration: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return TakeTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
@ -164,6 +212,12 @@ extension ObservableType {
- returns: An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func skip<S: SchedulerType>(duration: S.TimeInterval, scheduler: S)
-> Observable<E> {
return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func skip<S: SchedulerType>(duration: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return SkipTime(source: self.asObservable(), duration: duration, scheduler: scheduler)
@ -200,6 +254,12 @@ extension ObservableType {
- returns: Time-shifted sequence.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func delaySubscription<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Observable<E> {
return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func delaySubscription<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return DelaySubscription(source: self.asObservable(), dueTime: dueTime, scheduler: scheduler)
@ -258,6 +318,12 @@ extension ObservableType {
- returns: An observable sequence with a TimeoutError in case of a timeout.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func timeout<S: SchedulerType>(dueTime: S.TimeInterval, scheduler: S)
-> Observable<E> {
return Timeout(source: self.asObservable(), dueTime: dueTime, other: nil, scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func timeout<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
-> Observable<E> {
return Timeout(source: self.asObservable(), dueTime: dueTime, other: nil, scheduler: scheduler)
@ -272,6 +338,12 @@ extension ObservableType {
- returns: The source sequence switching to the other sequence in case of a timeout.
*/
@warn_unused_result(message="http://git.io/rxs.uo")
public func timeout<S: SchedulerType, O: ObservableConvertibleType where E == O.E>(dueTime: S.TimeInterval, other: O, scheduler: S)
-> Observable<E> {
return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)
}
@available(*, deprecated=2.0.0, message="Please use version with named scheduler parameter.")
public func timeout<S: SchedulerType, O: ObservableConvertibleType where E == O.E>(dueTime: S.TimeInterval, other: O, _ scheduler: S)
-> Observable<E> {
return Timeout(source: self.asObservable(), dueTime: dueTime, other: other.asObservable(), scheduler: scheduler)

4
RxTests/RxSwiftTests/Tests/Driver+Test.swift
View File

@ -670,7 +670,7 @@ extension DriverTest {
extension DriverTest {
func testAsDriver_debounce() {
let hotObservable = BackgroundThreadPrimitiveHotObservable<Int>()
let driver = hotObservable.asDriver(onErrorJustReturn: -1).debounce(0.0, MainScheduler.sharedInstance)
let driver = hotObservable.asDriver(onErrorJustReturn: -1).debounce(0.0, scheduler: MainScheduler.sharedInstance)
let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
XCTAssertTrue(hotObservable.subscriptions == [SubscribedToHotObservable])
@ -685,7 +685,7 @@ extension DriverTest {
func testAsDriver_throttle() {
let hotObservable = BackgroundThreadPrimitiveHotObservable<Int>()
let driver = hotObservable.asDriver(onErrorJustReturn: -1).throttle(0.0, MainScheduler.sharedInstance)
let driver = hotObservable.asDriver(onErrorJustReturn: -1).throttle(0.0, scheduler: MainScheduler.sharedInstance)
let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
XCTAssertTrue(hotObservable.subscriptions == [SubscribedToHotObservable])

10
RxTests/RxSwiftTests/Tests/Observable+BlockingTest.swift
View File

@ -42,7 +42,7 @@ extension ObservableBlockingTest {
func testToArray_withRealScheduler() {
let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let array = try! interval(0.001, scheduler)
let array = try! interval(0.001, scheduler: scheduler)
.take(10)
.toBlocking()
.toArray()
@ -79,7 +79,7 @@ extension ObservableBlockingTest {
func testFirst_withRealScheduler() {
let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let array = try! interval(0.001, scheduler)
let array = try! interval(0.001, scheduler: scheduler)
.take(10)
.toBlocking()
.first()
@ -116,7 +116,7 @@ extension ObservableBlockingTest {
func testLast_withRealScheduler() {
let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let array = try! interval(0.001, scheduler)
let array = try! interval(0.001, scheduler: scheduler)
.take(10)
.toBlocking()
.last()
@ -176,7 +176,7 @@ extension ObservableBlockingTest {
func testSingle_withRealScheduler() {
let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let array = try! interval(0.001, scheduler)
let array = try! interval(0.001, scheduler: scheduler)
.take(1)
.toBlocking()
.single()
@ -273,7 +273,7 @@ extension ObservableBlockingTest {
func testSingle_predicate_withRealScheduler() {
let scheduler = ConcurrentDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let array = try! interval(0.001, scheduler)
let array = try! interval(0.001, scheduler: scheduler)
.take(4)
.toBlocking()
.single( { $0 == 3 } )

6
RxTests/RxSwiftTests/Tests/Observable+CreationTest.swift
View File

@ -274,7 +274,7 @@ extension ObservableCreationTests {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start {
range(Int.max, 1, scheduler)
range(Int.max, count: 1, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -287,7 +287,7 @@ extension ObservableCreationTests {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start(204) {
range(-10, 5, scheduler)
range(-10, count: 5, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -304,7 +304,7 @@ extension ObservableCreationTests {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start(207) {
repeatElement(42, scheduler)
repeatElement(42, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [

2
RxTests/RxSwiftTests/Tests/Observable+SingleTest.swift
View File

@ -1107,7 +1107,7 @@ extension ObservableSingleTest {
return failWith(e)
}
return timer(a * 50, scheduler)
return timer(a * 50, scheduler: scheduler)
}
}
}

6
RxTests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
View File

@ -1844,7 +1844,7 @@ extension ObservableStandardSequenceOperatorsTest {
let res = scheduler.start {
xs.flatMapFirst { (x) in
return interval(10, scheduler).map { _ in x } .take(x)
return interval(10, scheduler: scheduler).map { _ in x } .take(x)
}
}
@ -2477,7 +2477,7 @@ extension ObservableStandardSequenceOperatorsTest {
let res = scheduler.start {
xs.flatMap { (x) in
return interval(10, scheduler).map { _ in x } .take(x)
return interval(10, scheduler: scheduler).map { _ in x } .take(x)
}
}
@ -3146,7 +3146,7 @@ extension ObservableStandardSequenceOperatorsTest {
let res = scheduler.start {
xs.flatMapWithIndex { (x, _) in
return interval(10, scheduler).map { _ in x } .take(x)
return interval(10, scheduler: scheduler).map { _ in x } .take(x)
}
}

92
RxTests/RxSwiftTests/Tests/Observable+TimeTest.swift
View File

@ -33,7 +33,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(20, scheduler)
xs.throttle(20, scheduler: scheduler)
}
let correct = [
@ -66,7 +66,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(20, scheduler)
xs.throttle(20, scheduler: scheduler)
}
let correct = [
@ -102,7 +102,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(40, scheduler)
xs.throttle(40, scheduler: scheduler)
}
let correct = [
@ -135,7 +135,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(40, scheduler)
xs.throttle(40, scheduler: scheduler)
}
let correct: [Recorded<Int>] = [
@ -160,7 +160,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(10, scheduler)
xs.throttle(10, scheduler: scheduler)
}
let correct: [Recorded<Int>] = [
@ -185,7 +185,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(10, scheduler)
xs.throttle(10, scheduler: scheduler)
}
let correct: [Recorded<Int>] = [
@ -209,7 +209,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(10, scheduler)
xs.throttle(10, scheduler: scheduler)
}
let correct: [Recorded<Int>] = [
@ -237,7 +237,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.throttle(20, scheduler)
xs.throttle(20, scheduler: scheduler)
}
let correct: [Recorded<Int>] = [
@ -262,7 +262,7 @@ extension ObservableTimeTest {
let start = NSDate()
let a = try! [just(0), never()].toObservable().concat()
.throttle(2.0, scheduler)
.throttle(2.0, scheduler: scheduler)
.toBlocking()
.first()
@ -715,7 +715,7 @@ extension ObservableTimeTest {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start {
interval(100, scheduler)
interval(100, scheduler: scheduler)
}
let correct: [Recorded<Int64>] = [
@ -735,7 +735,7 @@ extension ObservableTimeTest {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start(210) {
interval(0, scheduler)
interval(0, scheduler: scheduler)
}
let correct: [Recorded<Int64>] = [
@ -762,7 +762,7 @@ extension ObservableTimeTest {
OSSpinLockLock(&lock)
let d = interval(0, scheduler).takeWhile { $0 < 10 } .subscribe(onNext: { t in
let d = interval(0, scheduler: scheduler).takeWhile { $0 < 10 } .subscribe(onNext: { t in
observer.on(.Next(t))
}, onCompleted: {
OSSpinLockUnlock(&lock)
@ -790,7 +790,7 @@ extension ObservableTimeTest {
let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start {
interval(1000, scheduler)
interval(1000, scheduler: scheduler)
}
let correct: [Recorded<Int64>] = [
@ -806,7 +806,7 @@ extension ObservableTimeTest {
let start = NSDate()
let a = try! interval(1, scheduler)
let a = try! interval(1, scheduler: scheduler)
.take(2)
.toBlocking()
.toArray()
@ -831,7 +831,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(0, scheduler)
xs.take(0, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -854,7 +854,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(25, scheduler)
xs.take(25, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -878,7 +878,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(50, scheduler)
xs.take(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -901,7 +901,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(50, scheduler)
xs.take(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -921,7 +921,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(50, scheduler)
xs.take(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -947,7 +947,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(55, scheduler).take(35, scheduler)
xs.take(55, scheduler: scheduler).take(35, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -976,7 +976,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.take(35, scheduler)
xs.take(35, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1006,7 +1006,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.delaySubscription(30, scheduler)
xs.delaySubscription(30, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1030,7 +1030,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.delaySubscription(30, scheduler)
xs.delaySubscription(30, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1054,7 +1054,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start(291) {
xs.delaySubscription(30, scheduler)
xs.delaySubscription(30, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1080,7 +1080,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.skip(0, scheduler)
xs.skip(0, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1104,7 +1104,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.skip(15, scheduler)
xs.skip(15, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1127,7 +1127,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.skip(50, scheduler)
xs.skip(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1147,7 +1147,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.skip(50, scheduler)
xs.skip(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1166,7 +1166,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.skip(50, scheduler)
xs.skip(50, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1311,7 +1311,7 @@ extension ObservableTimeTest {
func testBufferWithTimeOrCount_Default() {
let backgroundScheduler = SerialDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let result = try! range(1, 10, backgroundScheduler)
let result = try! range(1, count: 10, scheduler: backgroundScheduler)
.buffer(timeSpan: 1000, count: 3, scheduler: backgroundScheduler)
.skip(1)
.toBlocking()
@ -1511,7 +1511,7 @@ extension ObservableTimeTest {
func windowWithTimeOrCount_Default() {
let backgroundScheduler = SerialDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
let result = try! range(1, 10, backgroundScheduler)
let result = try! range(1, count: 10, scheduler: backgroundScheduler)
.window(timeSpan: 1000, count: 3, scheduler: backgroundScheduler)
.mapWithIndex { (o: Observable<Int>, i: Int) -> Observable<String> in
return o.map { (e: Int) -> String in
@ -1541,7 +1541,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(200, scheduler)
xs.timeout(200, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1562,7 +1562,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(200, scheduler)
xs.timeout(200, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1582,7 +1582,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(1000, scheduler)
xs.timeout(1000, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [])
@ -1604,7 +1604,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(30, scheduler)
xs.timeout(30, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1632,7 +1632,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(30, scheduler)
xs.timeout(30, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1665,7 +1665,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start(370) {
xs.timeout(40, scheduler)
xs.timeout(40, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1702,7 +1702,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1741,7 +1741,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1778,7 +1778,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1807,7 +1807,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1835,7 +1835,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1863,7 +1863,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1891,7 +1891,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1917,7 +1917,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [
@ -1951,7 +1951,7 @@ extension ObservableTimeTest {
])
let res = scheduler.start {
xs.timeout(100, other: ys, scheduler)
xs.timeout(100, other: ys, scheduler: scheduler)
}
XCTAssertEqual(res.messages, [