From ff452009cdb24cb5e220ebf276e3c7f67f7dac06 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sun, 14 Feb 2016 12:34:53 -0800 Subject: [PATCH] Fixes test compilation on Linux. --- .../Tests/Observable+SingleTest.swift | 480 +++++++++--------- Tests/RxTest.swift | 2 +- 2 files changed, 241 insertions(+), 241 deletions(-) diff --git a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift index 8151d397..79fdc82a 100644 --- a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift @@ -15,7 +15,7 @@ class ObservableSingleTest : RxTest { override func setUp() { super.setUp() } - + override func tearDown() { super.tearDown() } @@ -25,54 +25,54 @@ class ObservableSingleTest : RxTest { extension ObservableSingleTest { func testAsObservable_asObservable() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(220, 2), completed(250) ]) - + let ys = xs.asObservable() - + XCTAssert(xs !== ys) - + let res = scheduler.start { ys } - + let correct = [ next(220, 2), completed(250) ] - + XCTAssertEqual(res.events, correct) } func testAsObservable_hides() { let xs = PrimitiveHotObservable() - + let res = xs.asObservable() - + XCTAssertTrue(res !== xs) } - + func testAsObservable_never() { let scheduler = TestScheduler(initialClock: 0) - + let xs : Observable = Observable.never() - + let res = scheduler.start { xs } - + let correct: [Recorded>] = [] - + XCTAssertEqual(res.events, correct) } - + } // Distinct extension ObservableSingleTest { func testDistinctUntilChanged_allChanges() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -81,7 +81,7 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged { $0 } } let correctMessages = [ @@ -91,18 +91,18 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_someChanges() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), // * @@ -117,7 +117,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.distinctUntilChanged { $0 } } - + let correctMessages = [ next(210, 2), next(215, 3), @@ -126,18 +126,18 @@ extension ObservableSingleTest { next(240, 2), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_allEqual() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -146,25 +146,25 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged { l, r in true } } - + let correctMessages = [ next(210, 2), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_allDifferent() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -173,9 +173,9 @@ extension ObservableSingleTest { next(240, 2), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged({ l, r in false }) } - + let correctMessages = [ next(210, 2), next(220, 2), @@ -183,18 +183,18 @@ extension ObservableSingleTest { next(240, 2), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_keySelector_Div2() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -203,69 +203,69 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged({ $0 % 2 }) } - + let correctMessages = [ next(210, 2), next(230, 3), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_keySelectorThrows() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), next(220, 3), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged({ _ in throw testError }) } - + let correctMessages = [ next(210, 2), error(220, testError) ] - + let correctSubscriptions = [ Subscription(200, 220) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDistinctUntilChanged_comparerThrows() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), next(220, 3), completed(250) ]) - + let res = scheduler.start { xs.distinctUntilChanged({ $0 }, comparer: { _, _ in throw testError }) } - + let correctMessages = [ next(210, 2), error(220, testError) ] - + let correctSubscriptions = [ Subscription(200, 220) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -275,7 +275,7 @@ extension ObservableSingleTest { extension ObservableSingleTest { func testDoOn_shouldSeeAllValues() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -284,7 +284,7 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + var i = 0 var sum = 2 + 3 + 4 + 5 let res = scheduler.start { xs.doOn { e in @@ -292,15 +292,15 @@ extension ObservableSingleTest { case .Next: i += 1 sum -= e.element ?? 0 - + default: break } } } - + XCTAssertEqual(i, 4) XCTAssertEqual(sum, 0) - + let correctMessages = [ next(210, 2), next(220, 3), @@ -308,18 +308,18 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } func testDoOn_plainAction() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -328,7 +328,7 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + var i = 0 let res = scheduler.start { xs.doOn { e in switch e { @@ -338,9 +338,9 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(i, 4) - + let correctMessages = [ next(210, 2), next(220, 3), @@ -348,18 +348,18 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } func testDoOn_nextCompleted() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -368,7 +368,7 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + var i = 0 var sum = 2 + 3 + 4 + 5 var completedEvaluation = false @@ -383,11 +383,11 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(i, 4) XCTAssertEqual(sum, 0) XCTAssertEqual(completedEvaluation, true) - + let correctMessages = [ next(210, 2), next(220, 3), @@ -395,23 +395,23 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDoOn_completedNever() { let scheduler = TestScheduler(initialClock: 0) - + let recordedEvents: [Recorded>] = [ ] - + let xs = scheduler.createHotObservable(recordedEvents) - + var i = 0 var completedEvaluation = false let res = scheduler.start { xs.doOn { e in @@ -424,24 +424,24 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(i, 0) XCTAssertEqual(completedEvaluation, false) - + let correctMessages: [Recorded>] = [ ] - + let correctSubscriptions = [ Subscription(200, 1000) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDoOn_nextError() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -450,7 +450,7 @@ extension ObservableSingleTest { next(240, 5), error(250, testError) ]) - + var i = 0 var sum = 2 + 3 + 4 + 5 var sawError = false @@ -465,11 +465,11 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(i, 4) XCTAssertEqual(sum, 0) XCTAssertEqual(sawError, true) - + let correctMessages = [ next(210, 2), next(220, 3), @@ -477,18 +477,18 @@ extension ObservableSingleTest { next(240, 5), error(250, testError) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDoOn_nextErrorNot() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -497,7 +497,7 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + var i = 0 var sum = 2 + 3 + 4 + 5 var sawError = false @@ -512,11 +512,11 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(i, 4) XCTAssertEqual(sum, 0) XCTAssertEqual(sawError, false) - + let correctMessages = [ next(210, 2), next(220, 3), @@ -524,37 +524,37 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + let correctSubscriptions = [ Subscription(200, 250) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } - + func testDoOn_Throws() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), completed(250) ]) - + let res = scheduler.start { xs.doOn { _ in throw testError } } - + let correctMessages = [ error(210, testError, Int.self) ] - + let correctSubscriptions = [ Subscription(200, 210) ] - + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -665,7 +665,7 @@ extension ObservableSingleTest { XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) - XCTAssertEqual(recordedError as NSError, testError) + XCTAssertTrue((recordedError as! AnyObject) === testError) XCTAssertEqual(numberOfTimesInvoked, 1) } @@ -771,25 +771,25 @@ extension ObservableSingleTest { extension ObservableSingleTest { func testRetry_Basic() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(100, 1), next(150, 2), next(200, 3), completed(250) ]) - + let res = scheduler.start { xs.retry() } - + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), completed(450) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450) ]) @@ -797,42 +797,42 @@ extension ObservableSingleTest { func testRetry_Infinite() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(100, 1), next(150, 2), next(200, 3), ]) - + let res = scheduler.start { xs.retry() } - + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 1000) ]) } - + func testRetry_Observable_Error() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(100, 1), next(150, 2), next(200, 3), error(250, testError), ]) - + let res = scheduler.start(1100) { xs.retry() } - + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), @@ -845,7 +845,7 @@ extension ObservableSingleTest { next(900, 3), next(1050, 1) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450), Subscription(450, 700), @@ -853,21 +853,21 @@ extension ObservableSingleTest { Subscription(950, 1100) ]) } - + func testRetryCount_Basic() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(5, 1), next(10, 2), next(15, 3), error(20, testError) ]) - + let res = scheduler.start { xs.retry(3) } - + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), @@ -880,7 +880,7 @@ extension ObservableSingleTest { next(255, 3), error(260, testError) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 220), Subscription(220, 240), @@ -890,18 +890,18 @@ extension ObservableSingleTest { func testRetryCount_Dispose() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(5, 1), next(10, 2), next(15, 3), error(20, testError) ]) - + let res = scheduler.start(231) { xs.retry(3) } - + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), @@ -909,27 +909,27 @@ extension ObservableSingleTest { next(225, 1), next(230, 2), ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 220), Subscription(220, 231), ]) } - + func testRetryCount_Infinite() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(5, 1), next(10, 2), next(15, 3), error(20, testError) ]) - + let res = scheduler.start(231) { xs.retry(3) } - + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), @@ -937,34 +937,34 @@ extension ObservableSingleTest { next(225, 1), next(230, 2), ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 220), Subscription(220, 231), ]) } - + func testRetryCount_Completed() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(100, 1), next(150, 2), next(200, 3), completed(250) ]) - + let res = scheduler.start { xs.retry(3) } - + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), completed(450) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450), ]) @@ -1003,40 +1003,40 @@ struct CustomErrorType : ErrorType { extension ObservableSingleTest { func testRetryWhen_Never() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), completed(250) ]) - + let empty = scheduler.createHotObservable([ next(150, 1), completed(210) ]) - + let res = scheduler.start(300) { xs.retryWhen { (errors: Observable) in return empty } } - + let correct = [ completed(250, Int.self) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testRetryWhen_ObservableNever() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -1045,35 +1045,35 @@ extension ObservableSingleTest { next(240, 5), error(250, testError) ]) - + let never = scheduler.createHotObservable([ next(150, 1) ]) - + let res = scheduler.start() { xs.retryWhen { (errors: Observable) in return never } } - + let correct = [ next(210, 2), next(220, 3), next(230, 4), next(240, 5) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testRetryWhen_ObservableNeverComplete() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -1082,17 +1082,17 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let never = scheduler.createHotObservable([ next(150, 1) ]) - + let res = scheduler.start() { xs.retryWhen { (errors: Observable) in return never } } - + let correct = [ next(210, 2), next(220, 3), @@ -1100,62 +1100,62 @@ extension ObservableSingleTest { next(240, 5), completed(250) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testRetryWhen_ObservableEmpty() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(100, 1), next(150, 2), next(200, 3), completed(250) ]) - + let empty = scheduler.createHotObservable([ next(150, 0), completed(0) ]) - + let res = scheduler.start() { xs.retryWhen { (errors: Observable) in return empty } } - + let correct = [ next(300, 1), next(350, 2), next(400, 3), completed(450) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450) ]) } - - + + func testRetryWhen_ObservableNextError() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(10, 1), next(20, 2), error(30, testError), completed(40) ]) - + let res = scheduler.start(300) { xs.retryWhen { (errors: Observable) in return errors.scan(0) { (_a, e) in @@ -1168,7 +1168,7 @@ extension ObservableSingleTest { } } } - + let correct = [ next(210, 1), next(220, 2), @@ -1176,62 +1176,62 @@ extension ObservableSingleTest { next(250, 2), error(260, testError1) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230), Subscription(230, 260) ]) } - - + + func testRetryWhen_ObservableComplete() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(10, 1), next(20, 2), error(30, testError), completed(40) ]) - + let empty = scheduler.createHotObservable([ next(150, 1), completed(230) ]) - + let res = scheduler.start() { xs.retryWhen({ (errors: Observable) in return empty.asObservable() }) } - + let correct = [ next(210, 1), next(220, 2), completed(230) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230) ]) } func testRetryWhen_ObservableNextComplete() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(10, 1), next(20, 2), error(30, testError), completed(40) ]) - + let res = scheduler.start(300) { xs.retryWhen { (errors: Observable) in return errors.scan(0) { (a, e) in @@ -1241,7 +1241,7 @@ extension ObservableSingleTest { } } } - + let correct = [ next(210, 1), next(220, 2), @@ -1249,59 +1249,59 @@ extension ObservableSingleTest { next(250, 2), completed(260) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230), Subscription(230, 260) ]) } - + func testRetryWhen_ObservableInfinite() { - + let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createColdObservable([ next(10, 1), next(20, 2), error(30, testError), completed(40) ]) - + let never = scheduler.createHotObservable([ next(150, 1) ]) - + let res = scheduler.start() { xs.retryWhen { (errors: Observable) in return never } } - + let correct = [ next(210, 1), next(220, 2) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230) ]) } - + func testRetryWhen_Incremental_BackOff() { - + let scheduler = TestScheduler(initialClock: 0) - + // just fails let xs = scheduler.createColdObservable([ next(5, 1), error(10, testError) ]) - + let res = scheduler.start(800) { xs.retryWhen { (errors: Observable) in errors.scan((0, nil)) { (a: (Int, NSError!), e) in @@ -1316,7 +1316,7 @@ extension ObservableSingleTest { } } } - + let correct = [ next(205, 1), next(265, 1), @@ -1324,9 +1324,9 @@ extension ObservableSingleTest { next(535, 1), error(540, testError) ] - + XCTAssertEqual(res.events, correct) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 210), Subscription(260, 270), @@ -1397,99 +1397,99 @@ extension ObservableSingleTest { extension ObservableSingleTest { func testScan_Seed_Never() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(0, 0) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { $0 + $1 } } - + XCTAssertEqual(res.events, [ ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 1000) ]) } - + func testScan_Seed_Empty() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), completed(250) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { $0 + $1 } } - + XCTAssertEqual(res.events, [ completed(250) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testScan_Seed_Return() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(220, 2), completed(250) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { $0 + $1 } } - + XCTAssertEqual(res.events, [ next(220, seed + 2), completed(250) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testScan_Seed_Throw() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), error(250, testError) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { $0 + $1 } } - + XCTAssertEqual(res.events, [ error(250, testError) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testScan_Seed_SomeData() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -1498,13 +1498,13 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { $0 + $1 } } - + let messages = [ next(210, seed + 2), next(220, seed + 2 + 3), @@ -1512,17 +1512,17 @@ extension ObservableSingleTest { next(240, seed + 2 + 3 + 4 + 5), completed(250) ] - + XCTAssertEqual(res.events, messages) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) ]) } - + func testScan_Seed_AccumulatorThrows() { let scheduler = TestScheduler(initialClock: 0) - + let xs = scheduler.createHotObservable([ next(150, 1), next(210, 2), @@ -1531,9 +1531,9 @@ extension ObservableSingleTest { next(240, 5), completed(250) ]) - + let seed = 42 - + let res = scheduler.start { xs.scan(seed) { (a, e) in if e == 4 { @@ -1543,15 +1543,15 @@ extension ObservableSingleTest { } } } - + XCTAssertEqual(res.events, [ next(210, seed + 2), next(220, seed + 2 + 3), error(230, testError) ]) - + XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230) ]) } -} \ No newline at end of file +} diff --git a/Tests/RxTest.swift b/Tests/RxTest.swift index 6476e348..7935167f 100644 --- a/Tests/RxTest.swift +++ b/Tests/RxTest.swift @@ -30,7 +30,7 @@ class RxTest : XCTestCase { #if os(Linux) - var allTests : [(String, () -> Void)] = [] + var allTests : [(String, () throws -> Void)] = [] #endif private var startResourceCount: Int32 = 0