From b9018f69afdc2bd258ec7a3104ec1b1c49c0e2a1 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sun, 20 Dec 2015 17:43:19 +0100 Subject: [PATCH] Renamed `MockObserver` property `messages` to `events`. --- RxCocoa/Common/_RXObjCRuntime.m | 5 +- RxTests.podspec | 4 +- RxTests/MockObserver.swift | 4 +- .../Mocks/PrimitiveMockObserver.swift | 6 +- .../Tests/BehaviorSubjectTest.swift | 24 +- Tests/RxSwiftTests/Tests/DisposableTest.swift | 2 +- Tests/RxSwiftTests/Tests/Driver+Test.swift | 12 +- .../Tests/Observable+AggregateTest.swift | 38 +-- .../Tests/Observable+BindingTest.swift | 62 ++--- .../Tests/Observable+ConcurrencyTest.swift | 46 ++-- .../Tests/Observable+CreationTest.swift | 44 ++-- ...bservable+MultipleTest+CombineLatest.swift | 118 ++++----- .../Observable+MultipleTest+CombineLatest.tt | 58 ++--- .../Tests/Observable+MultipleTest+Zip.swift | 92 +++---- .../Tests/Observable+MultipleTest+Zip.tt | 44 ++-- .../Tests/Observable+MultipleTest.swift | 214 ++++++++-------- .../Tests/Observable+SingleTest.swift | 78 +++--- ...rvable+StandardSequenceOperatorsTest.swift | 232 +++++++++--------- .../Tests/Observable+TimeTest.swift | 120 ++++----- 19 files changed, 601 insertions(+), 602 deletions(-) diff --git a/RxCocoa/Common/_RXObjCRuntime.m b/RxCocoa/Common/_RXObjCRuntime.m index 13f9f022..f766b3b7 100644 --- a/RxCocoa/Common/_RXObjCRuntime.m +++ b/RxCocoa/Common/_RXObjCRuntime.m @@ -517,7 +517,6 @@ SWIZZLE_OBSERVE_METHOD(void, rx_ulong) SWIZZLE_OBSERVE_METHOD(void, rx_block) SWIZZLE_OBSERVE_METHOD(void, float) SWIZZLE_OBSERVE_METHOD(void, double) -SWIZZLE_OBSERVE_METHOD(void, BOOL) SWIZZLE_OBSERVE_METHOD(void, SEL) SWIZZLE_OBSERVE_METHOD(void, id, id) @@ -532,7 +531,6 @@ SWIZZLE_OBSERVE_METHOD(void, id, rx_ulong) SWIZZLE_OBSERVE_METHOD(void, id, rx_block) SWIZZLE_OBSERVE_METHOD(void, id, float) SWIZZLE_OBSERVE_METHOD(void, id, double) -SWIZZLE_OBSERVE_METHOD(void, id, BOOL) SWIZZLE_OBSERVE_METHOD(void, id, SEL) // MARK: RXObjCRuntime @@ -588,8 +586,9 @@ static NSMutableDictionary *optimi optimizedObserversByMethodEncoding = [NSMutableDictionary dictionary]; } - optimizedObserversByMethodEncoding[methodEncoding] = registration; DLOG(@"Added optimized method: %@ (%@)", methodEncoding, NSStringFromSelector(selector)); + ALWAYS(optimizedObserversByMethodEncoding[methodEncoding] == nil, @"Optimized observer already registered") + optimizedObserversByMethodEncoding[methodEncoding] = registration; } /** diff --git a/RxTests.podspec b/RxTests.podspec index dd3bc56d..904e49f1 100644 --- a/RxTests.podspec +++ b/RxTests.podspec @@ -22,7 +22,7 @@ func testMap() { let res = scheduler.start { xs.map { $0 * 2 } } - let correctMessages = [ + let correctEvents = [ next(210, 0 * 2), next(220, 1 * 2), next(230, 2 * 2), @@ -34,7 +34,7 @@ func testMap() { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctEvents) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } ``` diff --git a/RxTests/MockObserver.swift b/RxTests/MockObserver.swift index bbcbbd56..355c66b7 100644 --- a/RxTests/MockObserver.swift +++ b/RxTests/MockObserver.swift @@ -21,7 +21,7 @@ public class MockObserver /** Recorded events. */ - public private(set) var messages = [Recorded>]() + public private(set) var events = [Recorded>]() init(scheduler: TestScheduler) { _scheduler = scheduler @@ -33,6 +33,6 @@ public class MockObserver - parameter event: Event that occured. */ public func on(event: Event) { - messages.append(Recorded(time: _scheduler.now, event: event)) + events.append(Recorded(time: _scheduler.now, event: event)) } } \ No newline at end of file diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift index 515f6ce9..202fc8c8 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift @@ -13,13 +13,13 @@ import RxTests class PrimitiveMockObserver : ObserverType { typealias Element = ElementType - var messages: [Recorded>] + var events: [Recorded>] init() { - self.messages = [] + self.events = [] } func on(event: Event) { - messages.append(Recorded(time: 0, event: event)) + events.append(Recorded(time: 0, event: event)) } } \ No newline at end of file diff --git a/Tests/RxSwiftTests/Tests/BehaviorSubjectTest.swift b/Tests/RxSwiftTests/Tests/BehaviorSubjectTest.swift index 49ab1ced..33ce9c70 100644 --- a/Tests/RxSwiftTests/Tests/BehaviorSubjectTest.swift +++ b/Tests/RxSwiftTests/Tests/BehaviorSubjectTest.swift @@ -58,21 +58,21 @@ class BehaviorSubjectTest : RxTest { scheduler.start() - XCTAssertEqual(results1.messages, [ + XCTAssertEqual(results1.events, [ next(300, 4), next(340, 5), next(410, 6), next(520, 7) ]) - XCTAssertEqual(results2.messages, [ + XCTAssertEqual(results2.events, [ next(400, 5), next(410, 6), next(520, 7), next(630, 8) ]) - XCTAssertEqual(results3.messages, [ + XCTAssertEqual(results3.events, [ next(900, 10), next(940, 11) ]) @@ -122,21 +122,21 @@ class BehaviorSubjectTest : RxTest { scheduler.start() - XCTAssertEqual(results1.messages, [ + XCTAssertEqual(results1.events, [ next(300, 4), next(340, 5), next(410, 6), next(520, 7) ]) - XCTAssertEqual(results2.messages, [ + XCTAssertEqual(results2.events, [ next(400, 5), next(410, 6), next(520, 7), completed(630) ]) - XCTAssertEqual(results3.messages, [ + XCTAssertEqual(results3.events, [ completed(900) ]) } @@ -185,21 +185,21 @@ class BehaviorSubjectTest : RxTest { scheduler.start() - XCTAssertEqual(results1.messages, [ + XCTAssertEqual(results1.events, [ next(300, 4), next(340, 5), next(410, 6), next(520, 7) ]) - XCTAssertEqual(results2.messages, [ + XCTAssertEqual(results2.events, [ next(400, 5), next(410, 6), next(520, 7), error(630, testError) ]) - XCTAssertEqual(results3.messages, [ + XCTAssertEqual(results3.events, [ error(900, testError) ]) } @@ -241,16 +241,16 @@ class BehaviorSubjectTest : RxTest { scheduler.start() - XCTAssertEqual(results1.messages, [ + XCTAssertEqual(results1.events, [ next(300, 100), ]) - XCTAssertEqual(results2.messages, [ + XCTAssertEqual(results2.events, [ next(400, 100), completed(630) ]) - XCTAssertEqual(results3.messages, [ + XCTAssertEqual(results3.events, [ completed(900) ]) } diff --git a/Tests/RxSwiftTests/Tests/DisposableTest.swift b/Tests/RxSwiftTests/Tests/DisposableTest.swift index 79a5a3df..319777c3 100644 --- a/Tests/RxSwiftTests/Tests/DisposableTest.swift +++ b/Tests/RxSwiftTests/Tests/DisposableTest.swift @@ -56,7 +56,7 @@ class DisposableTest : RxTest { return xs.asObservable() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 3), next(270, 4), next(340, 5), diff --git a/Tests/RxSwiftTests/Tests/Driver+Test.swift b/Tests/RxSwiftTests/Tests/Driver+Test.swift index f9ca9fc6..ac4bb811 100644 --- a/Tests/RxSwiftTests/Tests/Driver+Test.swift +++ b/Tests/RxSwiftTests/Tests/Driver+Test.swift @@ -139,13 +139,13 @@ extension DriverTest { scheduler.start() - XCTAssertEqual(observer1.messages, [ + XCTAssertEqual(observer1.events, [ next(210, 0), next(220, 1), next(230, 2) ]) - XCTAssertEqual(observer2.messages, [ + XCTAssertEqual(observer2.events, [ next(225, 1), next(230, 2), next(240, 3), @@ -153,7 +153,7 @@ extension DriverTest { completed(250) ]) - XCTAssertEqual(observer3.messages, [ + XCTAssertEqual(observer3.events, [ next(270, 0), next(280, 1), ]) @@ -212,13 +212,13 @@ extension DriverTest { scheduler.start() - XCTAssertEqual(observer1.messages, [ + XCTAssertEqual(observer1.events, [ next(210, 0), next(220, 1), next(230, 2) ]) - XCTAssertEqual(observer2.messages, [ + XCTAssertEqual(observer2.events, [ next(225, 1), next(230, 2), next(240, 3), @@ -226,7 +226,7 @@ extension DriverTest { completed(250) ]) - XCTAssertEqual(observer3.messages, [ + XCTAssertEqual(observer3.events, [ next(270, 0), next(280, 1), ]) diff --git a/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift b/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift index e533d99c..1e63668b 100644 --- a/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift @@ -42,7 +42,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -66,7 +66,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -88,7 +88,7 @@ extension ObservableAggregateTest { Subscription(200, 210) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -108,7 +108,7 @@ extension ObservableAggregateTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -136,7 +136,7 @@ extension ObservableAggregateTest { Subscription(200, 260) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -172,7 +172,7 @@ extension ObservableAggregateTest { Subscription(200, 240) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -195,7 +195,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -219,7 +219,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -241,7 +241,7 @@ extension ObservableAggregateTest { Subscription(200, 210) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -261,7 +261,7 @@ extension ObservableAggregateTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -289,7 +289,7 @@ extension ObservableAggregateTest { Subscription(200, 260) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -316,7 +316,7 @@ extension ObservableAggregateTest { Subscription(200, 240) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -343,7 +343,7 @@ extension ObservableAggregateTest { Subscription(200, 260) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } } @@ -373,7 +373,7 @@ extension ObservableAggregateTest { Subscription(200, 220) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -401,7 +401,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -425,7 +425,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -447,7 +447,7 @@ extension ObservableAggregateTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -470,7 +470,7 @@ extension ObservableAggregateTest { Subscription(200, 210) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -497,7 +497,7 @@ extension ObservableAggregateTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } } \ No newline at end of file diff --git a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift index fb74f3b8..79790d47 100644 --- a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift @@ -110,7 +110,7 @@ extension ObservableBindingTest { let res = scheduler.start { conn.refCount() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), next(230, 3), @@ -232,12 +232,12 @@ extension ObservableBindingTest { scheduler.start() - XCTAssertEqual(o1.messages, [ + XCTAssertEqual(o1.events, [ next(220, 2), next(230, 3) ]) - XCTAssertEqual(o2.messages, [ + XCTAssertEqual(o2.events, [ next(230, 3), next(240, 4), next(250, 5), @@ -245,11 +245,11 @@ extension ObservableBindingTest { next(270, 7) ]) - XCTAssertEqual(o3.messages, [ + XCTAssertEqual(o3.events, [ next(260, 6) ]) - XCTAssertEqual(o4.messages, [ + XCTAssertEqual(o4.events, [ next(290, 9), completed(300) ]) @@ -303,7 +303,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 5), next(450, 6), next(450, 7), @@ -354,7 +354,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 5), next(450, 6), next(450, 7), @@ -406,7 +406,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 5), next(450, 6), next(450, 7), @@ -461,7 +461,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 5), next(450, 6), next(450, 7), @@ -514,7 +514,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 7), next(520, 11), ]) @@ -563,7 +563,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 7), next(520, 11), next(560, 20), @@ -613,7 +613,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 7), next(520, 11), next(560, 20), @@ -666,7 +666,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 7), ]) @@ -717,7 +717,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 3), next(450, 4), next(450, 1), @@ -773,7 +773,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 8), next(450, 5), next(450, 6), @@ -826,7 +826,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 8), next(450, 5), next(450, 6), @@ -882,7 +882,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(450, 4), next(450, 1), next(450, 8), @@ -1001,7 +1001,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1013,7 +1013,7 @@ extension ObservableBindingTest { next(450, 9) ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), next(370, 6), @@ -1070,7 +1070,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1081,7 +1081,7 @@ extension ObservableBindingTest { error(440, testError), ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), error(365, testError), @@ -1136,7 +1136,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1147,7 +1147,7 @@ extension ObservableBindingTest { completed(440) ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), completed(365) @@ -1196,7 +1196,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch completed(365), @@ -1204,7 +1204,7 @@ extension ObservableBindingTest { completed(440) ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ completed(365) ]) @@ -1303,7 +1303,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1314,7 +1314,7 @@ extension ObservableBindingTest { next(450, 9) ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), next(370, 6), @@ -1369,7 +1369,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1379,7 +1379,7 @@ extension ObservableBindingTest { next(450, 9), ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), error(365, testError), @@ -1433,7 +1433,7 @@ extension ObservableBindingTest { scheduler.start(); - XCTAssertEqual(res1.messages, [ + XCTAssertEqual(res1.events, [ // 1rt batch next(340, 8), next(360, 5), @@ -1443,7 +1443,7 @@ extension ObservableBindingTest { next(450, 9), ]) - XCTAssertEqual(res2.messages, [ + XCTAssertEqual(res2.events, [ next(355, 8), next(360, 5), completed(365) diff --git a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift index 6e7d72f4..956e2767 100644 --- a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift @@ -174,7 +174,7 @@ extension ObservableConcurrencyTest { return subscription }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) xs.on(.Next(1)) @@ -182,7 +182,7 @@ extension ObservableConcurrencyTest { return NopDisposable.instance }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2) @@ -192,7 +192,7 @@ extension ObservableConcurrencyTest { return NopDisposable.instance }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2), @@ -216,7 +216,7 @@ extension ObservableConcurrencyTest { return subscription }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ completed() ]) XCTAssert(xs.subscriptions == [UnsunscribedFromHotObservable]) @@ -238,7 +238,7 @@ extension ObservableConcurrencyTest { return subscription }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) xs.on(.Next(1)) @@ -246,7 +246,7 @@ extension ObservableConcurrencyTest { return NopDisposable.instance }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2) @@ -256,7 +256,7 @@ extension ObservableConcurrencyTest { return NopDisposable.instance }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2), @@ -282,7 +282,7 @@ extension ObservableConcurrencyTest { return subscription }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) @@ -295,7 +295,7 @@ extension ObservableConcurrencyTest { return NopDisposable.instance }, { scheduler in - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), ]) XCTAssert(xs.subscriptions == [UnsunscribedFromHotObservable]) @@ -403,7 +403,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) xs.on(.Next(1)) @@ -411,7 +411,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2) @@ -421,7 +421,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2), @@ -447,7 +447,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ completed() ]) XCTAssert(xs.subscriptions == [UnsunscribedFromHotObservable]) @@ -479,7 +479,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.3) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0, 0), next(0, 1), completed() @@ -504,7 +504,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) xs.on(.Next(1)) @@ -512,7 +512,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2) @@ -522,7 +522,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), next(1), next(2), @@ -543,7 +543,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0) ]) @@ -555,7 +555,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas sleep(0.1) - XCTAssertEqual(observer.messages, [ + XCTAssertEqual(observer.events, [ next(0), ]) XCTAssert(xs.subscriptions == [UnsunscribedFromHotObservable]) @@ -588,7 +588,7 @@ extension ObservableConcurrencyTest { xs.subscribeOn(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) @@ -607,7 +607,7 @@ extension ObservableConcurrencyTest { xs.subscribeOn(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(300) ]) @@ -627,7 +627,7 @@ extension ObservableConcurrencyTest { xs.subscribeOn(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(300, testError) ]) @@ -648,7 +648,7 @@ extension ObservableConcurrencyTest { xs.subscribeOn(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), ]) diff --git a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift index 3809e2a3..dcef74eb 100644 --- a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift @@ -24,7 +24,7 @@ extension ObservableCreationTests { return just(42) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(200, 42), completed(200) ]) @@ -37,7 +37,7 @@ extension ObservableCreationTests { return just(42, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 42), completed(202) ]) @@ -50,7 +50,7 @@ extension ObservableCreationTests { return just(42, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) } @@ -76,7 +76,7 @@ extension ObservableCreationTests { scheduler.start() - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(101, 42) ]) } @@ -100,7 +100,7 @@ extension ObservableCreationTests { [3, 1, 2, 4].toObservable() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(200, 3), next(200, 1), next(200, 2), @@ -115,7 +115,7 @@ extension ObservableCreationTests { [3, 1, 2, 4].toObservable(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 3), next(202, 1), next(203, 2), @@ -130,7 +130,7 @@ extension ObservableCreationTests { [3, 1, 2, 4].toObservable(scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 3), next(202, 1), ]) @@ -145,7 +145,7 @@ extension ObservableCreationTests { sequenceOf(3, 1, 2, 4) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(200, 3), next(200, 1), next(200, 2), @@ -160,7 +160,7 @@ extension ObservableCreationTests { sequenceOf(3, 1, 2, 4, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 3), next(202, 1), next(203, 2), @@ -175,7 +175,7 @@ extension ObservableCreationTests { sequenceOf(3, 1, 2, 4, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 3), next(202, 1), ]) @@ -193,7 +193,7 @@ extension ObservableCreationTests { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 0), next(202, 1), next(203, 2), @@ -212,7 +212,7 @@ extension ObservableCreationTests { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(201, testError) ]) @@ -227,7 +227,7 @@ extension ObservableCreationTests { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 0), error(202, testError) ]) @@ -243,7 +243,7 @@ extension ObservableCreationTests { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 0), next(202, 1) ]) @@ -278,7 +278,7 @@ extension ObservableCreationTests { range(Int.max, count: 1, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, Int.max), completed(202) ]) @@ -291,7 +291,7 @@ extension ObservableCreationTests { range(-10, count: 5, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, -10), next(202, -9), next(203, -8) @@ -308,7 +308,7 @@ extension ObservableCreationTests { repeatElement(42, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(201, 42), next(202, 42), next(203, 42), @@ -349,7 +349,7 @@ extension ObservableCreationTests { XCTAssert(disposable === _d) - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 200), completed(400) ]) @@ -395,7 +395,7 @@ extension ObservableCreationTests { XCTAssert(disposable === _d) - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 200), error(400, testError) ]) @@ -441,7 +441,7 @@ extension ObservableCreationTests { XCTAssert(disposable === _d) - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 200), ]) @@ -475,7 +475,7 @@ extension ObservableCreationTests { }) as Observable } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(200, testError), ]) @@ -502,7 +502,7 @@ extension ObservableCreationTests { }) as Observable } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(200, testError), ]) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift index 0f020998..b2041f2b 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.swift @@ -40,7 +40,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -72,7 +72,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(220)]) + XCTAssertEqual(res.events, [completed(220)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -106,7 +106,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError) ]) @@ -140,7 +140,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -176,7 +176,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 3), @@ -222,7 +222,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -260,7 +260,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(230)]) + XCTAssertEqual(res.events, [completed(230)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -302,7 +302,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(230, testError) ]) @@ -343,7 +343,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -388,7 +388,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 6), @@ -441,7 +441,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -485,7 +485,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(240)]) + XCTAssertEqual(res.events, [completed(240)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -535,7 +535,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(240, testError) ]) @@ -583,7 +583,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -637,7 +637,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, 10), @@ -697,7 +697,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -747,7 +747,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(250)]) + XCTAssertEqual(res.events, [completed(250)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -805,7 +805,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(250, testError) ]) @@ -860,7 +860,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -923,7 +923,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(250, 15), @@ -990,7 +990,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -1046,7 +1046,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(260)]) + XCTAssertEqual(res.events, [completed(260)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -1112,7 +1112,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(260, testError) ]) @@ -1174,7 +1174,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -1246,7 +1246,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, 21), @@ -1320,7 +1320,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -1382,7 +1382,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(270)]) + XCTAssertEqual(res.events, [completed(270)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -1456,7 +1456,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(270, testError) ]) @@ -1525,7 +1525,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -1606,7 +1606,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(270, 28), @@ -1687,7 +1687,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -1755,7 +1755,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(280)]) + XCTAssertEqual(res.events, [completed(280)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) @@ -1837,7 +1837,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(280, testError) ]) @@ -1913,7 +1913,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -2003,7 +2003,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 36), @@ -2058,7 +2058,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 1000)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 210)]) @@ -2082,7 +2082,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 1000)]) @@ -2109,7 +2109,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [completed(215)]) + XCTAssertEqual(res.events, [completed(215)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 215)]) @@ -2135,7 +2135,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [completed(215)]) + XCTAssertEqual(res.events, [completed(215)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 215)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 210)]) @@ -2160,7 +2160,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 1000)]) @@ -2185,7 +2185,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 1000)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2212,7 +2212,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [next(220, (2 + 3)), completed(240)]) + XCTAssertEqual(res.events, [next(220, (2 + 3)), completed(240)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 240)]) @@ -2239,7 +2239,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [next(220, (2 + 3)), completed(240)]) + XCTAssertEqual(res.events, [next(220, (2 + 3)), completed(240)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 240)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -2264,7 +2264,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2289,7 +2289,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2315,7 +2315,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2341,7 +2341,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2366,7 +2366,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2391,7 +2391,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError2)]) + XCTAssertEqual(res.events, [error(220, testError2)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2417,7 +2417,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2443,7 +2443,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2469,7 +2469,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2495,7 +2495,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2521,7 +2521,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -2547,7 +2547,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -2587,7 +2587,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 250)]) @@ -2622,7 +2622,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 250)]) @@ -2651,7 +2651,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -2680,7 +2680,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(235, 4 + 6), next(240, 4 + 7), error(245, testError) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt index cb816d07..73490cfb 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+CombineLatest.tt @@ -33,7 +33,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -59,7 +59,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [completed(<%= 200 + 10 * i %>)]) + XCTAssertEqual(res.events, [completed(<%= 200 + 10 * i %>)]) <% for j in 0.. XCTAssertEqual(e<%= j %>.subscriptions, [Subscription(200, <%= 200 + 10 * (j + 1) %>)]) @@ -85,7 +85,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(<%= 200 + (i * 10) %>, testError) ]) @@ -117,7 +117,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -146,7 +146,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ <% let sum = ([Int](1...i)).reduce(0) { $0 + $1 } %> next(<%= 200 + i * 10 %>, <%= sum %>), <% for j in 1...i { %> @@ -180,7 +180,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 1000)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 210)]) @@ -204,7 +204,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 1000)]) @@ -231,7 +231,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [completed(215)]) + XCTAssertEqual(res.events, [completed(215)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 215)]) @@ -257,7 +257,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [completed(215)]) + XCTAssertEqual(res.events, [completed(215)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 215)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 210)]) @@ -282,7 +282,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 1000)]) @@ -307,7 +307,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 1000)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -334,7 +334,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [next(220, (2 + 3)), completed(240)]) + XCTAssertEqual(res.events, [next(220, (2 + 3)), completed(240)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 240)]) @@ -361,7 +361,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [next(220, (2 + 3)), completed(240)]) + XCTAssertEqual(res.events, [next(220, (2 + 3)), completed(240)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 240)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -386,7 +386,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -411,7 +411,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -437,7 +437,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -463,7 +463,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -488,7 +488,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -513,7 +513,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError2)]) + XCTAssertEqual(res.events, [error(220, testError2)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -539,7 +539,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -565,7 +565,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError1)]) + XCTAssertEqual(res.events, [error(220, testError1)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -591,7 +591,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -617,7 +617,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(220, testError)]) + XCTAssertEqual(res.events, [error(220, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -643,7 +643,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 220)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -669,7 +669,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 220)]) @@ -709,7 +709,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 250)]) @@ -744,7 +744,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 250)]) @@ -773,7 +773,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [error(230, testError)]) + XCTAssertEqual(res.events, [error(230, testError)]) XCTAssertEqual(e0.subscriptions, [Subscription(200, 230)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 230)]) @@ -802,7 +802,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(235, 4 + 6), next(240, 4 + 7), error(245, testError) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift index 6baf727e..f917d2da 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift @@ -53,7 +53,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -83,7 +83,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(220) ]) @@ -117,7 +117,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 3), completed(400) ]) @@ -155,7 +155,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 10), completed(220) ]) @@ -210,7 +210,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -245,7 +245,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(230) ]) @@ -286,7 +286,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 6), completed(400) ]) @@ -334,7 +334,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 15), completed(230) ]) @@ -395,7 +395,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -435,7 +435,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(240) ]) @@ -483,7 +483,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, 10), completed(400) ]) @@ -542,7 +542,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 20), completed(240) ]) @@ -609,7 +609,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -654,7 +654,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(250) ]) @@ -709,7 +709,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(250, 15), completed(400) ]) @@ -780,7 +780,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 25), completed(250) ]) @@ -853,7 +853,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -903,7 +903,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(260) ]) @@ -965,7 +965,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, 21), completed(400) ]) @@ -1049,7 +1049,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 30), completed(260) ]) @@ -1128,7 +1128,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -1183,7 +1183,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(270) ]) @@ -1252,7 +1252,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(270, 28), completed(400) ]) @@ -1350,7 +1350,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 35), completed(270) ]) @@ -1435,7 +1435,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -1495,7 +1495,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(280) ]) @@ -1571,7 +1571,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 36), completed(400) ]) @@ -1684,7 +1684,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 40), completed(280) ]) @@ -1721,7 +1721,7 @@ extension ObservableMultipleTest { zip(n, e) { $0 + $1 } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(n.subscriptions, [ Subscription(200, 1000) @@ -1748,7 +1748,7 @@ extension ObservableMultipleTest { zip(e, n) { $0 + $1 } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(n.subscriptions, [ Subscription(200, 1000) @@ -1780,7 +1780,7 @@ extension ObservableMultipleTest { let messages = [ completed(215, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e.subscriptions, [ Subscription(200, 210) @@ -1810,7 +1810,7 @@ extension ObservableMultipleTest { } let messages = [completed(215, Int.self)] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e.subscriptions, [ Subscription(200, 210) @@ -1839,7 +1839,7 @@ extension ObservableMultipleTest { } let messages: [Recorded>] = [] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o.subscriptions, [ Subscription(200, 220) @@ -1868,7 +1868,7 @@ extension ObservableMultipleTest { } let messages: [Recorded>] = [] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o.subscriptions, [ Subscription(200, 220) @@ -1903,7 +1903,7 @@ extension ObservableMultipleTest { completed(240) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 230) @@ -1935,7 +1935,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -1967,7 +1967,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -1998,7 +1998,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2029,7 +2029,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2061,7 +2061,7 @@ extension ObservableMultipleTest { error(220, testError2, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2094,7 +2094,7 @@ extension ObservableMultipleTest { error(220, testError1, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2127,7 +2127,7 @@ extension ObservableMultipleTest { error(220, testError1, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2162,7 +2162,7 @@ extension ObservableMultipleTest { completed(225) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2197,7 +2197,7 @@ extension ObservableMultipleTest { completed(225) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2230,7 +2230,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -2263,7 +2263,7 @@ extension ObservableMultipleTest { error(220, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt index 55be7144..468f750d 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt @@ -45,7 +45,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) let subscriptions = [Subscription(200, 1000)] @@ -70,7 +70,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(<%= 200 + i * 10 %>) ]) @@ -97,7 +97,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(<%= 200 + i * 10 %>, <%= i * (i + 1) / 2 %>), completed(400) ]) @@ -126,7 +126,7 @@ extension ObservableMultipleTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, <%= 5 * i %>), completed(<%= 220 + (i - 2) * 10 %>) ]) @@ -157,7 +157,7 @@ extension ObservableMultipleTest { zip(n, e) { $0 + $1 } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(n.subscriptions, [ Subscription(200, 1000) @@ -184,7 +184,7 @@ extension ObservableMultipleTest { zip(e, n) { $0 + $1 } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(n.subscriptions, [ Subscription(200, 1000) @@ -214,7 +214,7 @@ extension ObservableMultipleTest { } let messages: [Recorded] = [completed(215)] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e.subscriptions, [ Subscription(200, 210) @@ -244,7 +244,7 @@ extension ObservableMultipleTest { } let messages: [Recorded] = [completed(215)] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(e.subscriptions, [ Subscription(200, 210) @@ -273,7 +273,7 @@ extension ObservableMultipleTest { } let messages: [Recorded] = [] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o.subscriptions, [ Subscription(200, 220) @@ -302,7 +302,7 @@ extension ObservableMultipleTest { } let messages: [Recorded] = [] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o.subscriptions, [ Subscription(200, 220) @@ -337,7 +337,7 @@ extension ObservableMultipleTest { completed(240) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 230) @@ -369,7 +369,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -401,7 +401,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -432,7 +432,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -463,7 +463,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -495,7 +495,7 @@ extension ObservableMultipleTest { error(220, testError2) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -528,7 +528,7 @@ extension ObservableMultipleTest { error(220, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -561,7 +561,7 @@ extension ObservableMultipleTest { error(220, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -596,7 +596,7 @@ extension ObservableMultipleTest { completed(225) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -631,7 +631,7 @@ extension ObservableMultipleTest { completed(225) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -664,7 +664,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) @@ -697,7 +697,7 @@ extension ObservableMultipleTest { error(220, testError) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(o1.subscriptions, [ Subscription(200, 220) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift index 2f1d9c2f..ec537716 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift @@ -49,7 +49,7 @@ extension ObservableMultipleTest { XCTAssertEqual(230, handlerCalled!) - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), next(240, 4), @@ -86,7 +86,7 @@ extension ObservableMultipleTest { XCTAssertEqual(230, handlerCalled!) - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), error(230, testError1), @@ -128,7 +128,7 @@ extension ObservableMultipleTest { [xs1, xs2, xs3].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), next(230, 3), @@ -173,7 +173,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), completed(230) @@ -203,7 +203,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(xs1.subscriptions, [ @@ -231,7 +231,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(230) ]) @@ -262,7 +262,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), next(240, 4), @@ -296,7 +296,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), ]) @@ -329,7 +329,7 @@ extension ObservableMultipleTest { [xs1, xs2].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), error(250, testError) @@ -367,7 +367,7 @@ extension ObservableMultipleTest { [xs1, xs2, xs3].catchError() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), next(230, 4), @@ -447,7 +447,7 @@ extension ObservableMultipleTest { completed(650) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 600) @@ -526,7 +526,7 @@ extension ObservableMultipleTest { error(450, testError), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 450) @@ -595,7 +595,7 @@ extension ObservableMultipleTest { error(500, testError), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 500) @@ -678,7 +678,7 @@ extension ObservableMultipleTest { completed(650) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 600) @@ -759,7 +759,7 @@ extension ObservableMultipleTest { error(450, testError), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 450) @@ -830,7 +830,7 @@ extension ObservableMultipleTest { error(500, testError), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 500) @@ -898,7 +898,7 @@ extension ObservableMultipleTest { error(400, testError), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 400) @@ -987,7 +987,7 @@ extension ObservableMultipleTest { completed(320) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 240), @@ -1023,7 +1023,7 @@ extension ObservableMultipleTest { completed(250, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1053,7 +1053,7 @@ extension ObservableMultipleTest { let messages: [Recorded>] = [ ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1082,7 +1082,7 @@ extension ObservableMultipleTest { let messages: [Recorded>] = [ ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 1000), @@ -1113,7 +1113,7 @@ extension ObservableMultipleTest { error(250, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1145,7 +1145,7 @@ extension ObservableMultipleTest { error(230, testError, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1176,7 +1176,7 @@ extension ObservableMultipleTest { error(230, testError1, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1209,7 +1209,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1243,7 +1243,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1275,7 +1275,7 @@ extension ObservableMultipleTest { next(210, 2), ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1306,7 +1306,7 @@ extension ObservableMultipleTest { let messages: [Recorded>] = [ ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 1000), @@ -1341,7 +1341,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1374,7 +1374,7 @@ extension ObservableMultipleTest { error(230, testError1, Int.self) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1407,7 +1407,7 @@ extension ObservableMultipleTest { error(250, testError2) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1447,7 +1447,7 @@ extension ObservableMultipleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 225), @@ -1505,7 +1505,7 @@ extension ObservableMultipleTest { completed(420) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs1.subscriptions, [ Subscription(200, 230), @@ -1751,7 +1751,7 @@ extension ObservableMultipleTest { completed(650) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(ys1.subscriptions, [ Subscription(300, 530), @@ -1816,7 +1816,7 @@ extension ObservableMultipleTest { completed(600) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 600), @@ -1887,7 +1887,7 @@ extension ObservableMultipleTest { error(450, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450), @@ -1948,7 +1948,7 @@ extension ObservableMultipleTest { error(500, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 500), @@ -2018,7 +2018,7 @@ extension ObservableMultipleTest { completed(760) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400), @@ -2096,7 +2096,7 @@ extension ObservableMultipleTest { completed(780) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400), @@ -2174,7 +2174,7 @@ extension ObservableMultipleTest { completed(720) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450), @@ -2252,7 +2252,7 @@ extension ObservableMultipleTest { completed(750) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 750), @@ -2326,7 +2326,7 @@ extension ObservableMultipleTest { next(440, 7) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400), @@ -2399,7 +2399,7 @@ extension ObservableMultipleTest { error(400, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400), @@ -2474,7 +2474,7 @@ extension ObservableMultipleTest { error(490, testError1) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400), @@ -2582,7 +2582,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), completed(225) @@ -2618,7 +2618,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), error(225, testError) @@ -2654,7 +2654,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), next(230, 4), @@ -2691,7 +2691,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(220, 3), next(230, 4), @@ -2725,7 +2725,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(225) ]) @@ -2754,7 +2754,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(225, testError) ]) @@ -2783,7 +2783,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -2810,7 +2810,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -2841,7 +2841,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(210) ]) @@ -2875,7 +2875,7 @@ extension ObservableMultipleTest { l.doOn { _ in sourceNotDisposed = true } .takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(210) ]) @@ -2903,7 +2903,7 @@ extension ObservableMultipleTest { l.takeUntil(r .doOn { _ in sourceNotDisposed = true }) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 2), completed(240) ]) @@ -2930,7 +2930,7 @@ extension ObservableMultipleTest { l.takeUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(225, testError), ]) @@ -2957,7 +2957,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(x1.subscriptions, [ @@ -2988,7 +2988,7 @@ extension ObservableMultipleTest { [x1, x2, x3].amb() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(x1.subscriptions, [ @@ -3020,7 +3020,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(225) ]) @@ -3052,7 +3052,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), completed(240) ]) @@ -3085,7 +3085,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), error(220, testError) ]) @@ -3118,7 +3118,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 3), completed(250) ]) @@ -3150,7 +3150,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError) ]) @@ -3181,7 +3181,7 @@ extension ObservableMultipleTest { x1.amb(x2) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError) ]) @@ -3216,7 +3216,7 @@ extension ObservableMultipleTest { [e0, e1, e2].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) for e in [e0, e1, e2] { XCTAssertEqual(e.subscriptions, [Subscription(200, 1000)]) @@ -3239,7 +3239,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 1000)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 210)]) @@ -3261,7 +3261,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)]) XCTAssertEqual(e1.subscriptions, [Subscription(200, 1000)]) @@ -3285,7 +3285,7 @@ extension ObservableMultipleTest { ([e0, e1] as [HotObservable]).combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(215) ]) @@ -3312,7 +3312,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 2 + 3), completed(240) ]) @@ -3338,7 +3338,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError) ]) @@ -3364,7 +3364,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError) ]) @@ -3389,7 +3389,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError1) ]) @@ -3413,7 +3413,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError2) ]) @@ -3439,7 +3439,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError2) ]) @@ -3465,7 +3465,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(230, testError2) ]) @@ -3496,7 +3496,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 2 + 3), next(225, 3 + 4), next(230, 4 + 5), @@ -3530,7 +3530,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(235, 4 + 6), next(240, 4 + 7), completed(250) @@ -3561,7 +3561,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(230, testError) ]) @@ -3590,7 +3590,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(235, 4 + 6), next(240, 4 + 7), error(245, testError) @@ -3619,7 +3619,7 @@ extension ObservableMultipleTest { [e0, e1].combineLatest { x throws -> Int in throw testError } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError) ]) @@ -3650,7 +3650,7 @@ extension ObservableMultipleTest { [e0, e1, e2].combineLatest { _ in 42 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(500) ]) @@ -3685,7 +3685,7 @@ extension ObservableMultipleTest { [e0, e1, e2].combineLatest { $0.reduce(0, combine:+) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 6), next(410, 9), next(420, 12), @@ -3724,7 +3724,7 @@ extension ObservableMultipleTest { [e0, e1, e2].combineLatest { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, EquatableArray([1, 2, 3])), next(240, EquatableArray([1, 5, 3])), next(250, EquatableArray([4, 5, 3])), @@ -3767,7 +3767,7 @@ extension ObservableMultipleTest { [e0, e1, e2].combineLatest { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, EquatableArray([1, 2, 3])), next(240, EquatableArray([1, 5, 3])), next(250, EquatableArray([4, 5, 3])), @@ -3813,7 +3813,7 @@ extension ObservableMultipleTest { [e0, e1, e2].zip { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, EquatableArray([1, 2, 3])), next(260, EquatableArray([4, 5, 6])), completed(420) @@ -3854,7 +3854,7 @@ extension ObservableMultipleTest { [e0, e1, e2].zip { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, EquatableArray([1, 2, 3])), next(260, EquatableArray([4, 5, 6])), completed(310) @@ -3891,7 +3891,7 @@ extension ObservableMultipleTest { [e0, e1, e2].zip { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, EquatableArray([1, 2, 3])), error(250, testError) ]) @@ -3928,7 +3928,7 @@ extension ObservableMultipleTest { [e0, e1, e2, e3].zip { _ in 42 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(230, testError) ]) @@ -3964,7 +3964,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 4), next(240, 5), completed(250) @@ -4000,7 +4000,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(225, testError), ]) @@ -4033,7 +4033,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(220, testError), ]) @@ -4067,7 +4067,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -4096,7 +4096,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -4124,7 +4124,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(225, testError) ]) @@ -4158,7 +4158,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(300, testError) ]) @@ -4191,7 +4191,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -4219,7 +4219,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -4246,7 +4246,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(l.subscriptions, [ @@ -4282,7 +4282,7 @@ extension ObservableMultipleTest { l.skipUntil(r) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssert(disposed, "disposed") @@ -4321,7 +4321,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) { x, y in "\(x)\(y)" } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "4bar"), next(310, "5bar"), next(340, "6foo"), @@ -4353,7 +4353,7 @@ extension ObservableMultipleTest { .take(1) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(200, "35"), completed(200) ]) @@ -4384,7 +4384,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) { x, y in "\(x)\(y)" } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "4bar"), next(310, "5bar"), next(340, "6foo"), @@ -4425,7 +4425,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) { x, y in "\(x)\(y)" } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(250, "3bar"), next(260, "4bar"), next(310, "5bar"), @@ -4470,7 +4470,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) { x, y in "\(x)\(y)" } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "4bar"), next(310, "5bar"), next(340, "6foo"), @@ -4514,7 +4514,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) { x, y in "\(x)\(y)" } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "4bar"), next(310, "5bar"), next(340, "6foo"), @@ -4560,7 +4560,7 @@ extension ObservableMultipleTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "4bar"), error(310, testError) ]) @@ -4602,7 +4602,7 @@ extension ObservableMultipleTest { xs.withLatestFrom(ys) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(260, "bar"), next(310, "bar"), next(340, "foo"), diff --git a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift index db63675d..7dde9ff8 100644 --- a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift @@ -45,7 +45,7 @@ extension ObservableSingleTest { completed(250) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) } @@ -66,7 +66,7 @@ extension ObservableSingleTest { let correct: [Recorded] = [] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) } // ... @@ -101,7 +101,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -136,7 +136,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -163,7 +163,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -193,7 +193,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -221,7 +221,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -246,7 +246,7 @@ extension ObservableSingleTest { Subscription(200, 220) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -271,7 +271,7 @@ extension ObservableSingleTest { Subscription(200, 220) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } } @@ -318,7 +318,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -358,7 +358,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -405,7 +405,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -440,7 +440,7 @@ extension ObservableSingleTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -487,7 +487,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -534,7 +534,7 @@ extension ObservableSingleTest { Subscription(200, 250) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -560,7 +560,7 @@ extension ObservableSingleTest { Subscription(200, 210) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } } @@ -581,7 +581,7 @@ extension ObservableSingleTest { xs.retry() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), @@ -606,7 +606,7 @@ extension ObservableSingleTest { xs.retry() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), @@ -631,7 +631,7 @@ extension ObservableSingleTest { xs.retry() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), @@ -666,7 +666,7 @@ extension ObservableSingleTest { xs.retry(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), next(215, 3), @@ -700,7 +700,7 @@ extension ObservableSingleTest { xs.retry(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), next(215, 3), @@ -728,7 +728,7 @@ extension ObservableSingleTest { xs.retry(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), next(215, 3), @@ -756,7 +756,7 @@ extension ObservableSingleTest { xs.retry(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 1), next(350, 2), next(400, 3), @@ -824,7 +824,7 @@ extension ObservableSingleTest { completed(250, Int.self) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) @@ -861,7 +861,7 @@ extension ObservableSingleTest { next(240, 5) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) @@ -899,7 +899,7 @@ extension ObservableSingleTest { completed(250) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) @@ -935,7 +935,7 @@ extension ObservableSingleTest { completed(450) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 450) @@ -973,7 +973,7 @@ extension ObservableSingleTest { error(260, testError1) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230), @@ -1010,7 +1010,7 @@ extension ObservableSingleTest { completed(230) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230) @@ -1046,7 +1046,7 @@ extension ObservableSingleTest { completed(260) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230), @@ -1080,7 +1080,7 @@ extension ObservableSingleTest { next(220, 2) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 230) @@ -1121,7 +1121,7 @@ extension ObservableSingleTest { error(540, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 210), @@ -1152,7 +1152,7 @@ extension ObservableSingleTest { error(210, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 210) @@ -1204,7 +1204,7 @@ extension ObservableSingleTest { xs.scan(seed) { $0 + $1 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(xs.subscriptions, [ @@ -1226,7 +1226,7 @@ extension ObservableSingleTest { xs.scan(seed) { $0 + $1 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(250) ]) @@ -1250,7 +1250,7 @@ extension ObservableSingleTest { xs.scan(seed) { $0 + $1 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, seed + 2), completed(250) ]) @@ -1274,7 +1274,7 @@ extension ObservableSingleTest { xs.scan(seed) { $0 + $1 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(250, testError) ]) @@ -1309,7 +1309,7 @@ extension ObservableSingleTest { completed(250) ] - XCTAssertEqual(res.messages, messages) + XCTAssertEqual(res.events, messages) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) @@ -1340,7 +1340,7 @@ extension ObservableSingleTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, seed + 2), next(220, seed + 2 + 3), error(230, testError) diff --git a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift index 4b767e34..54ef1023 100644 --- a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift @@ -68,7 +68,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 3), next(340, 5), next(390, 7), @@ -110,7 +110,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 3), next(270, 4), next(340, 5), @@ -157,7 +157,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(600) ]) @@ -195,7 +195,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 3), next(340, 5), next(390, 7) @@ -239,7 +239,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), next(290, 13), @@ -281,7 +281,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), next(290, 13), @@ -325,7 +325,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), error(270, testError) @@ -365,7 +365,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), next(290, 13), @@ -408,7 +408,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), next(290, 13) @@ -448,7 +448,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), next(290, 13), @@ -492,7 +492,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(205) ]) @@ -535,7 +535,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), next(260, 5), error(290, testError) @@ -571,7 +571,7 @@ extension ObservableStandardSequenceOperatorsTest { return xs.takeWhileWithIndex { num, index in index < 5 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 100), next(210, 2), next(260, 5), @@ -605,7 +605,7 @@ extension ObservableStandardSequenceOperatorsTest { return xs.takeWhileWithIndex { num , index in return index >= 0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 100), next(210, 2), next(260, 5), @@ -641,7 +641,7 @@ extension ObservableStandardSequenceOperatorsTest { return xs.takeWhileWithIndex { num, index in index >= 0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 100), next(210, 2), next(260, 5), @@ -684,7 +684,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 100), next(210, 2), next(260, 5), @@ -718,7 +718,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -740,7 +740,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -770,7 +770,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -800,7 +800,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -829,7 +829,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 290) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -857,7 +857,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 230) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -877,7 +877,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -899,7 +899,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -929,7 +929,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -959,7 +959,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -988,7 +988,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 290) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1016,7 +1016,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 230) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1059,7 +1059,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 1000) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1081,7 +1081,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1111,7 +1111,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1141,7 +1141,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 300) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1170,7 +1170,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 290) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1202,7 +1202,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 230) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1234,7 +1234,7 @@ extension ObservableStandardSequenceOperatorsTest { Subscription(200, 230) ] - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1267,7 +1267,7 @@ extension ObservableStandardSequenceOperatorsTest { ] XCTAssertTrue(checked) - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } @@ -1300,7 +1300,7 @@ extension ObservableStandardSequenceOperatorsTest { ] XCTAssertTrue(checked) - XCTAssertEqual(res.messages, correctMessages) + XCTAssertEqual(res.events, correctMessages) XCTAssertEqual(xs.subscriptions, correctSubscriptions) } #endif @@ -1355,7 +1355,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1431,7 +1431,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1505,7 +1505,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1581,7 +1581,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1655,7 +1655,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1728,7 +1728,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapFirst { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1805,7 +1805,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -1848,7 +1848,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 4), next(230, 4), next(240, 4), @@ -1912,7 +1912,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2001,7 +2001,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2088,7 +2088,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2175,7 +2175,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2262,7 +2262,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2346,7 +2346,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMap { $0 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2434,7 +2434,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2481,7 +2481,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 4), next(230, 3), next(230, 4), @@ -2520,7 +2520,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, ElementIndexPair(4, 0)), next(220, ElementIndexPair(3, 1)), next(250, ElementIndexPair(5, 2)), @@ -2580,7 +2580,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2668,7 +2668,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2756,7 +2756,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2844,7 +2844,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -2931,7 +2931,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -3015,7 +3015,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.flatMapWithIndex { x, _ in x } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -3103,7 +3103,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 102), next(390, 103), next(410, 104), @@ -3150,7 +3150,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 4), next(230, 3), next(230, 4), @@ -3207,7 +3207,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(20) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3263,7 +3263,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(17) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3319,7 +3319,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3368,7 +3368,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(20) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3424,7 +3424,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(17) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3480,7 +3480,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3522,7 +3522,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), ]) @@ -3562,7 +3562,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3588,7 +3588,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(0) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(200) ]) @@ -3617,7 +3617,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.take(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -3659,7 +3659,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(7) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(300, 9), next(300, 13), next(300, 7), @@ -3691,7 +3691,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(5) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(310, 9), next(310, 13), next(310, 7), @@ -3725,7 +3725,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(5) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(350, 7), next(350, 1), next(350, -1), @@ -3757,7 +3757,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(7) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(300, testError) ]) @@ -3784,7 +3784,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(5) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(310, testError) ]) @@ -3813,7 +3813,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(5) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(360, testError) ]) @@ -3836,7 +3836,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(0) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(xs.subscriptions, [ @@ -3865,7 +3865,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.takeLast(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(400, 3), next(400, 8), next(400, 11), @@ -3924,7 +3924,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(20) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(690) ]) @@ -3964,7 +3964,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(17) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(690) ]) @@ -4003,7 +4003,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(460, 72), next(510, 76), next(560, 32), @@ -4049,7 +4049,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(0) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), next(230, 13), next(270, 7), @@ -4105,7 +4105,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(20) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(690, testError) ]) @@ -4144,7 +4144,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(17) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(690, testError) ]) @@ -4183,7 +4183,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 1), next(300, -1), next(310, 3), @@ -4235,7 +4235,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(xs.subscriptions, [ @@ -4272,7 +4272,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skip(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 1), next(300, -1), next(310, 3), @@ -4317,7 +4317,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(330) ]) @@ -4355,7 +4355,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(390, 4), next(410, 17), next(450, 8), @@ -4399,7 +4399,7 @@ extension ObservableStandardSequenceOperatorsTest { - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(270, testError) ]) @@ -4437,7 +4437,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(390, 4), next(410, 17), next(450, 8), @@ -4479,7 +4479,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 300) @@ -4515,7 +4515,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(390, 4), next(410, 17), next(450, 8) @@ -4556,7 +4556,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 100), next(210, 2), next(260, 5), @@ -4607,7 +4607,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(290, testError) ]) @@ -4641,7 +4641,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skipWhileWithIndex { x, i in i < 5 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(350, 7), next(390, 4), next(410, 17), @@ -4675,7 +4675,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.skipWhileWithIndex { x, i in i < 5 } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(350, 7), next(390, 4), error(400, testError) @@ -4711,7 +4711,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(350, testError) ]) @@ -4754,7 +4754,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(460, 72), completed(460) ]) @@ -4783,7 +4783,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(320, RxError.ArgumentOutOfRange) ]) @@ -4822,7 +4822,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(460, 72), completed(460) ]) @@ -4850,7 +4850,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(10) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(310, testError) ]) @@ -4889,7 +4889,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(3) } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 250) @@ -4926,7 +4926,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(3) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 1), completed(280) ]) @@ -4957,7 +4957,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.elementAt(0) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 9), completed(210) ]) @@ -4984,7 +4984,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.single() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(250, RxError.NoElements) ]) @@ -5006,7 +5006,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.single() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), completed(250) ]) @@ -5030,7 +5030,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.single() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 2), error(220, RxError.MoreThanOneElement) ]) @@ -5052,7 +5052,7 @@ extension ObservableStandardSequenceOperatorsTest { xs.single() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError) ]) @@ -5075,7 +5075,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(250, RxError.NoElements) ]) @@ -5102,7 +5102,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(230, 4), completed(250) ]) @@ -5130,7 +5130,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 3), error(240, RxError.MoreThanOneElement) ]) @@ -5154,7 +5154,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError) ]) @@ -5184,7 +5184,7 @@ extension ObservableStandardSequenceOperatorsTest { } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(230, testError) ]) diff --git a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift index 4f924abc..f16c8220 100644 --- a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift @@ -45,7 +45,7 @@ extension ObservableTimeTest { completed(400) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 400) @@ -78,7 +78,7 @@ extension ObservableTimeTest { error(400, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 400) @@ -111,7 +111,7 @@ extension ObservableTimeTest { completed(400) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 400) @@ -143,7 +143,7 @@ extension ObservableTimeTest { error(400, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 400) @@ -168,7 +168,7 @@ extension ObservableTimeTest { completed(300) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 300) @@ -193,7 +193,7 @@ extension ObservableTimeTest { error(300, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 300) @@ -216,7 +216,7 @@ extension ObservableTimeTest { let correct: [Recorded>] = [ ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 1000) @@ -248,7 +248,7 @@ extension ObservableTimeTest { completed(300) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) let subscriptions = [ Subscription(200, 300) @@ -306,7 +306,7 @@ extension ObservableTimeTest { error(320, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 320) @@ -349,7 +349,7 @@ extension ObservableTimeTest { completed(500) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400) @@ -394,7 +394,7 @@ extension ObservableTimeTest { completed(500) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400) @@ -435,7 +435,7 @@ extension ObservableTimeTest { completed(320) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 300) @@ -478,7 +478,7 @@ extension ObservableTimeTest { error(320, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 320) @@ -520,7 +520,7 @@ extension ObservableTimeTest { error(320, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 320) @@ -565,7 +565,7 @@ extension ObservableTimeTest { completed(500) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400) @@ -611,7 +611,7 @@ extension ObservableTimeTest { completed(500) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 400) @@ -653,7 +653,7 @@ extension ObservableTimeTest { completed(320) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 300) @@ -697,7 +697,7 @@ extension ObservableTimeTest { error(320, testError) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 320) @@ -729,7 +729,7 @@ extension ObservableTimeTest { next(900, 6) ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) } func testInterval_TimeSpan_Zero() { @@ -751,7 +751,7 @@ extension ObservableTimeTest { next(209, 8), ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) } func testInterval_TimeSpan_Zero_DefaultScheduler() { @@ -784,7 +784,7 @@ extension ObservableTimeTest { // wait until dispatch queue cleans it's resources OSSpinLockLock(&lock) - XCTAssertTrue(observer.messages.count == 10) + XCTAssertTrue(observer.events.count == 10) } func testInterval_TimeSpan_Disposed() { @@ -798,7 +798,7 @@ extension ObservableTimeTest { ] - XCTAssertEqual(res.messages, correct) + XCTAssertEqual(res.events, correct) } @@ -835,7 +835,7 @@ extension ObservableTimeTest { xs.take(0, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(201) ]) @@ -858,7 +858,7 @@ extension ObservableTimeTest { xs.take(25, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), completed(225) @@ -882,7 +882,7 @@ extension ObservableTimeTest { xs.take(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), completed(230) @@ -905,7 +905,7 @@ extension ObservableTimeTest { xs.take(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError), ]) @@ -925,7 +925,7 @@ extension ObservableTimeTest { xs.take(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(250) ]) @@ -951,7 +951,7 @@ extension ObservableTimeTest { xs.take(55, scheduler: scheduler).take(35, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), next(230, 3), @@ -980,7 +980,7 @@ extension ObservableTimeTest { xs.take(35, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), next(230, 3), @@ -1010,7 +1010,7 @@ extension ObservableTimeTest { xs.delaySubscription(30, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 42), next(290, 43), completed(300) @@ -1034,7 +1034,7 @@ extension ObservableTimeTest { xs.delaySubscription(30, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 42), next(290, 43), error(300, testError) @@ -1058,7 +1058,7 @@ extension ObservableTimeTest { xs.delaySubscription(30, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(280, 42), next(290, 43), ]) @@ -1084,7 +1084,7 @@ extension ObservableTimeTest { xs.skip(0, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 1), next(220, 2), completed(230) @@ -1108,7 +1108,7 @@ extension ObservableTimeTest { xs.skip(15, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(220, 2), completed(230) ]) @@ -1131,7 +1131,7 @@ extension ObservableTimeTest { xs.skip(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(230) ]) @@ -1151,7 +1151,7 @@ extension ObservableTimeTest { xs.skip(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(210, testError) ]) @@ -1170,7 +1170,7 @@ extension ObservableTimeTest { xs.skip(50, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ ]) XCTAssertEqual(xs.subscriptions, [ @@ -1195,7 +1195,7 @@ extension ObservableTimeTest { xs.ignoreElements() } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(230) ]) @@ -1227,7 +1227,7 @@ extension ObservableTimeTest { xs.buffer(timeSpan: 70, count: 3, scheduler: scheduler).map { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, EquatableArray([1, 2, 3])), next(310, EquatableArray([4])), next(370, EquatableArray([5, 6, 7])), @@ -1263,7 +1263,7 @@ extension ObservableTimeTest { xs.buffer(timeSpan: 70, count: 3, scheduler: scheduler).map { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, EquatableArray([1, 2, 3])), next(310, EquatableArray([4])), next(370, EquatableArray([5, 6, 7])), @@ -1298,7 +1298,7 @@ extension ObservableTimeTest { xs.buffer(timeSpan: 70, count: 3, scheduler: scheduler).map { EquatableArray($0) } } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, EquatableArray([1, 2, 3])), next(310, EquatableArray([4])), next(370, EquatableArray([5, 6, 7])) @@ -1352,7 +1352,7 @@ extension ObservableTimeTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, "0 1"), next(210, "0 2"), next(240, "0 3"), @@ -1397,7 +1397,7 @@ extension ObservableTimeTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, "0 1"), next(210, "0 2"), next(240, "0 3"), @@ -1443,7 +1443,7 @@ extension ObservableTimeTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, "0 1"), next(210, "0 2"), next(240, "0 3"), @@ -1487,7 +1487,7 @@ extension ObservableTimeTest { return result } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, "0 2"), next(240, "0 3"), next(270, "0 4"), @@ -1545,7 +1545,7 @@ extension ObservableTimeTest { xs.timeout(200, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(300) ]) @@ -1566,7 +1566,7 @@ extension ObservableTimeTest { xs.timeout(200, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(300, testError) ]) @@ -1586,7 +1586,7 @@ extension ObservableTimeTest { xs.timeout(1000, scheduler: scheduler) } - XCTAssertEqual(res.messages, []) + XCTAssertEqual(res.events, []) XCTAssertEqual(xs.subscriptions, [ Subscription(200, 1000) @@ -1608,7 +1608,7 @@ extension ObservableTimeTest { xs.timeout(30, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 42), next(225, 43), next(240, 44), @@ -1636,7 +1636,7 @@ extension ObservableTimeTest { xs.timeout(30, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(210, 42), next(220, 43), next(250, 44), @@ -1669,7 +1669,7 @@ extension ObservableTimeTest { xs.timeout(40, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(205, 1), next(210, 2), next(240, 3), @@ -1706,7 +1706,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(350, -1), next(500, -2), next(610, -3), @@ -1745,7 +1745,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, 3), next(310, 4), next(460, -1), @@ -1782,7 +1782,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, 3), next(310, 4) ]) @@ -1811,7 +1811,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(400, -1), ]) @@ -1839,7 +1839,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(400, -1), ]) @@ -1867,7 +1867,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(400, testError) ]) @@ -1895,7 +1895,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ completed(250) ]) @@ -1921,7 +1921,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ error(250, testError) ]) @@ -1955,7 +1955,7 @@ extension ObservableTimeTest { xs.timeout(100, other: ys, scheduler: scheduler) } - XCTAssertEqual(res.messages, [ + XCTAssertEqual(res.events, [ next(240, 3), next(320, 4), next(410, 5),