From 9cae95d3ef636f8f79f4fd1ff34082e5805d133d Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Fri, 25 Dec 2015 12:50:42 +0100 Subject: [PATCH] Fixes Swift 2.2 warnings. --- Documentation/GettingStarted.md | 3 +- .../Contents.swift | 2 +- .../Implementations/KVOObservable.swift | 4 +- RxDataSourceStarterKit/Differentiator.swift | 4 +- RxExample/RxExample.xcodeproj/project.pbxproj | 12 ++++ RxSwift/DataStructures/Bag.swift | 6 +- RxSwift/DataStructures/Queue.swift | 8 ++- RxSwift/Disposables/RefCountDisposable.swift | 4 +- .../CombineLatest+CollectionType.swift | 6 +- .../Implementations/CombineLatest.swift | 6 +- .../Observables/Implementations/Skip.swift | 2 +- .../Observables/Implementations/Take.swift | 2 +- .../Observables/Implementations/Window.swift | 3 +- .../Implementations/Zip+CollectionType.swift | 8 +-- RxSwift/Observables/Implementations/Zip.swift | 6 +- .../Schedulers/VirtualTimeSchedulerBase.swift | 2 +- Tests/RxCocoaTests/DelegateProxyTest.swift | 2 +- .../NSNotificationCenterTests.swift | 4 +- Tests/RxCocoaTests/SentMessageTest.swift | 5 +- .../TestImplementations/Mocks/MySubject.swift | 2 +- .../RxSwiftTests/Tests/AssumptionsTest.swift | 2 +- Tests/RxSwiftTests/Tests/BagTest.swift | 28 ++++---- .../Tests/BehaviorSubjectTest.swift | 8 +-- Tests/RxSwiftTests/Tests/DisposableTest.swift | 12 ++-- .../Tests/Observable+BindingTest.swift | 66 +++++++++---------- .../Tests/Observable+ConcurrencyTest.swift | 8 +-- .../Tests/Observable+CreationTest.swift | 2 +- .../Tests/Observable+MultipleTest.swift | 28 ++++---- .../Tests/Observable+SingleTest.swift | 19 +++--- ...rvable+StandardSequenceOperatorsTest.swift | 30 ++++----- .../Tests/Observable+SubscriptionTest.swift | 32 ++++----- 31 files changed, 172 insertions(+), 154 deletions(-) diff --git a/Documentation/GettingStarted.md b/Documentation/GettingStarted.md index a6086636..abd9e4c7 100644 --- a/Documentation/GettingStarted.md +++ b/Documentation/GettingStarted.md @@ -403,7 +403,8 @@ func myInterval(interval: NSTimeInterval) -> Observable { if cancel.disposed { return } - observer.on(.Next(next++)) + observer.on(.Next(next)) + next += 1 }) dispatch_resume(timer) diff --git a/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift index 43681215..71f812ca 100644 --- a/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift @@ -73,7 +73,7 @@ example("retry") { observer.on(.Next(2)) if count < 2 { observer.on(.Error(error)) - count++ + count += 1 } observer.on(.Next(3)) observer.on(.Next(4)) diff --git a/RxCocoa/Common/Observables/Implementations/KVOObservable.swift b/RxCocoa/Common/Observables/Implementations/KVOObservable.swift index 86e21048..8b29238f 100644 --- a/RxCocoa/Common/Observables/Implementations/KVOObservable.swift +++ b/RxCocoa/Common/Observables/Implementations/KVOObservable.swift @@ -100,11 +100,11 @@ func observeWeaklyKeyPathFor( let propertyName = keyPathSections[0] let remainingPaths = Array(keyPathSections[1.. Int { var x = _x - x = ((x >> 16) ^ x) &* 0x45d9f3b; - x = ((x >> 16) ^ x) &* 0x45d9f3b; - x = ((x >> 16) ^ x); + x = ((x >> 16) ^ x) &* 0x45d9f3b + x = ((x >> 16) ^ x) &* 0x45d9f3b + x = ((x >> 16) ^ x) return x; } diff --git a/RxSwift/DataStructures/Queue.swift b/RxSwift/DataStructures/Queue.swift index 43db307c..472af861 100644 --- a/RxSwift/DataStructures/Queue.swift +++ b/RxSwift/DataStructures/Queue.swift @@ -114,7 +114,7 @@ public struct Queue: SequenceType { } _storage[_pushNextIndex] = element - _pushNextIndex++ + _pushNextIndex += 1 _count = _count + 1 if _pushNextIndex >= _storage.count { @@ -176,12 +176,14 @@ public struct Queue: SequenceType { return nil } - count-- + count -= 1 if i >= self._storage.count { i -= self._storage.count } - return self._storage[i++] + let element = self._storage[i] + i += 1 + return element } } } diff --git a/RxSwift/Disposables/RefCountDisposable.swift b/RxSwift/Disposables/RefCountDisposable.swift index 53e308d4..e40f3bc7 100644 --- a/RxSwift/Disposables/RefCountDisposable.swift +++ b/RxSwift/Disposables/RefCountDisposable.swift @@ -64,7 +64,7 @@ public class RefCountDisposable : DisposeBase, Cancelable { let oldDisposable: Disposable? = _lock.calculateLocked { if let oldDisposable = _disposable where !_primaryDisposed { - _primaryDisposed = true; + _primaryDisposed = true if (_count == 0) { @@ -116,7 +116,7 @@ internal final class RefCountInnerDisposable: DisposeBase, Disposable init(_ parent: RefCountDisposable) { - _parent = parent; + _parent = parent super.init() } diff --git a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift index e91669b0..c1dba6bb 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift +++ b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift @@ -43,7 +43,7 @@ class CombineLatestCollectionTypeSink func next(index: Int) { if !_hasValue[index] { _hasValue[index] = true - _numberOfValues++ + _numberOfValues += 1 } if _numberOfValues == _arity { @@ -58,7 +58,7 @@ class CombineLatestSink else { var allOthersDone = true - for var i = 0; i < _arity; ++i { + for var i = 0; i < _arity; i += 1 { if i != index && !_isDone[i] { allOthersDone = false break @@ -83,7 +83,7 @@ class CombineLatestSink } _isDone[index] = true - _numberOfDone++ + _numberOfDone += 1 if _numberOfDone == _arity { forwardOn(.Completed) diff --git a/RxSwift/Observables/Implementations/Skip.swift b/RxSwift/Observables/Implementations/Skip.swift index 2c7c8e81..2b609681 100644 --- a/RxSwift/Observables/Implementations/Skip.swift +++ b/RxSwift/Observables/Implementations/Skip.swift @@ -32,7 +32,7 @@ class SkipCountSink : Sin forwardOn(.Next(value)) } else { - remaining-- + remaining -= 1 } case .Error: forwardOn(event) diff --git a/RxSwift/Observables/Implementations/Take.swift b/RxSwift/Observables/Implementations/Take.swift index 7b2f9d80..3ba2acc3 100644 --- a/RxSwift/Observables/Implementations/Take.swift +++ b/RxSwift/Observables/Implementations/Take.swift @@ -29,7 +29,7 @@ class TakeCountSink : Sin case .Next(let value): if _remaining > 0 { - _remaining-- + _remaining -= 1 forwardOn(.Next(value)) diff --git a/RxSwift/Observables/Implementations/Window.swift b/RxSwift/Observables/Implementations/Window.swift index 6044295a..d6a2f09a 100644 --- a/RxSwift/Observables/Implementations/Window.swift +++ b/RxSwift/Observables/Implementations/Window.swift @@ -75,7 +75,8 @@ class WindowTimeCountSink 0 { - _numberOfValues++ + _numberOfValues += 1 } } @@ -88,7 +88,7 @@ class ZipCollectionTypeSink : Sink, ZipSinkProtocol { for i in 0 ..< _arity { if !hasElements(i) { - hasValueAll = false; - break; + hasValueAll = false + break } } @@ -64,7 +64,7 @@ class ZipSink : Sink, ZipSinkProtocol { var allOthersDone = true let arity = _isDone.count - for var i = 0; i < arity; ++i { + for var i = 0; i < arity; i += 1 { if i != index && !_isDone[i] { allOthersDone = false break diff --git a/RxTests/Schedulers/VirtualTimeSchedulerBase.swift b/RxTests/Schedulers/VirtualTimeSchedulerBase.swift index c2cff122..fb6121b5 100644 --- a/RxTests/Schedulers/VirtualTimeSchedulerBase.swift +++ b/RxTests/Schedulers/VirtualTimeSchedulerBase.swift @@ -155,7 +155,7 @@ public class VirtualTimeSchedulerBase minIndex = index } - index++ + index += 1 } if minElement != nil { diff --git a/Tests/RxCocoaTests/DelegateProxyTest.swift b/Tests/RxCocoaTests/DelegateProxyTest.swift index 85312bb5..b4c64efd 100644 --- a/Tests/RxCocoaTests/DelegateProxyTest.swift +++ b/Tests/RxCocoaTests/DelegateProxyTest.swift @@ -87,7 +87,7 @@ class DelegateProxyTest : RxTest { let d = view.rx_proxy.observe("threeDView:didLearnSomething:") .subscribeNext { n in - nMessages++ + nMessages += 1 } XCTAssertTrue(nMessages == 0) diff --git a/Tests/RxCocoaTests/NSNotificationCenterTests.swift b/Tests/RxCocoaTests/NSNotificationCenterTests.swift index 68d3abff..ad4e963e 100644 --- a/Tests/RxCocoaTests/NSNotificationCenterTests.swift +++ b/Tests/RxCocoaTests/NSNotificationCenterTests.swift @@ -23,7 +23,7 @@ class NSNotificationCenterTests : RxTest { let subscription = notificationCenter.rx_notification("testNotification", object: nil) .subscribeNext { n in - numberOfNotifications++ + numberOfNotifications += 1 } XCTAssertTrue(numberOfNotifications == 0) @@ -59,7 +59,7 @@ class NSNotificationCenterTests : RxTest { let subscription = notificationCenter.rx_notification("testNotification", object: targetObject) .subscribeNext { n in - numberOfNotifications++ + numberOfNotifications += 1 } XCTAssertTrue(numberOfNotifications == 0) diff --git a/Tests/RxCocoaTests/SentMessageTest.swift b/Tests/RxCocoaTests/SentMessageTest.swift index edbeccf7..0d36d9cd 100644 --- a/Tests/RxCocoaTests/SentMessageTest.swift +++ b/Tests/RxCocoaTests/SentMessageTest.swift @@ -948,14 +948,15 @@ extension SentMessageTest { var i = 0 for o in observables { - let index = i++ + let index = i + i += 1 recordedParameters.append([]) _ = o.subscribe(onNext: { n in recordedParameters[index].append(n) }, onError: { e in XCTFail("Error happened \(e)") }, onCompleted: { () -> Void in - nCompleted++ + nCompleted += 1 }) } } diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift index 8b403855..787b1244 100644 --- a/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift +++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift @@ -46,7 +46,7 @@ class MySubject : SubjectType, ObserverType { } func subscribe(observer: O) -> Disposable { - _subscribeCount++ + _subscribeCount += 1 _observer = AnyObserver(observer) return AnonymousDisposable { diff --git a/Tests/RxSwiftTests/Tests/AssumptionsTest.swift b/Tests/RxSwiftTests/Tests/AssumptionsTest.swift index bf06d0f9..84fb9b95 100644 --- a/Tests/RxSwiftTests/Tests/AssumptionsTest.swift +++ b/Tests/RxSwiftTests/Tests/AssumptionsTest.swift @@ -84,7 +84,7 @@ class AssumptionsTest : RxTest { var count = 0 for _ in b { a.removeAll() - count++ + count += 1 } XCTAssertTrue(count == 4) diff --git a/Tests/RxSwiftTests/Tests/BagTest.swift b/Tests/RxSwiftTests/Tests/BagTest.swift index 9a5cb5aa..a265d198 100644 --- a/Tests/RxSwiftTests/Tests/BagTest.swift +++ b/Tests/RxSwiftTests/Tests/BagTest.swift @@ -46,17 +46,17 @@ extension BagTest { numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> DoSomething in { () -> () in numberForEachActions++ } }, + createNew: { () -> DoSomething in { () -> () in numberForEachActions += 1 } }, bagAction: { (bag: RxMutableBox>) in bag.value.forEach { $0() }; XCTAssertTrue(bag.value.count == i - j) } ) numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers++ } }, + createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers += 1 } }, bagAction: { (bag: RxMutableBox>>) in bag.value.on(.Next(1)); XCTAssertTrue(bag.value.count == i - j) } ) numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> Disposable in AnonymousDisposable { numberDisposables++ } }, + createNew: { () -> Disposable in AnonymousDisposable { numberDisposables += 1 } }, bagAction: { (bag: RxMutableBox>) in disposeAllIn(bag.value); XCTAssertTrue(bag.value.count == i - j) } ) @@ -93,17 +93,17 @@ extension BagTest { numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> DoSomething in { () -> () in numberForEachActions++ } }, + createNew: { () -> DoSomething in { () -> () in numberForEachActions += 1 } }, bagAction: { (bag: RxMutableBox>) in bag.value.forEach { $0() }; XCTAssertTrue(bag.value.count == i - j) } ) numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers++ } }, + createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers += 1 } }, bagAction: { (bag: RxMutableBox>>) in bag.value.on(.Next(1)); XCTAssertTrue(bag.value.count == i - j) } ) numberOfActionsAfter(i, deletionsFromStart: j, - createNew: { () -> Disposable in AnonymousDisposable { numberDisposables++ } }, + createNew: { () -> Disposable in AnonymousDisposable { numberDisposables += 1 } }, bagAction: { (bag: RxMutableBox>) in disposeAllIn(bag.value); XCTAssertTrue(bag.value.count == i - j) } ) @@ -129,19 +129,19 @@ extension BagTest { if increment1 == breakAt { bag1.value.removeAll() } - increment1++ + increment1 += 1 }) bag2.value.insert(AnyObserver { _ in if increment2 == breakAt { bag2.value.removeAll() } - increment2++ + increment2 += 1 }) bag3.value.insert(AnonymousDisposable { _ in if increment3 == breakAt { bag3.value.removeAll() } - increment3++ + increment3 += 1 }) } @@ -166,17 +166,17 @@ extension BagTest { numberOfActionsAfter(100, deletionsFromStart: 0, - createNew: { () -> DoSomething in { () -> () in numberForEachActions++ } }, + createNew: { () -> DoSomething in { () -> () in numberForEachActions += 1 } }, bagAction: { (bag: RxMutableBox>) in bag.value.removeAll(); bag.value.forEach { $0() } } ) numberOfActionsAfter(100, deletionsFromStart: 0, - createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers++ } }, + createNew: { () -> AnyObserver in AnyObserver { _ in numberObservers += 1 } }, bagAction: { (bag: RxMutableBox>>) in bag.value.removeAll(); bag.value.on(.Next(1)); } ) numberOfActionsAfter(100, deletionsFromStart: 0, - createNew: { () -> Disposable in AnonymousDisposable { numberDisposables++ } }, + createNew: { () -> Disposable in AnonymousDisposable { numberDisposables += 1 } }, bagAction: { (bag: RxMutableBox>) in bag.value.removeAll(); disposeAllIn(bag.value); } ) @@ -194,7 +194,7 @@ extension BagTest { var keys: [Bag.KeyType] = [] for _ in 0...KeyType] = [] for _ in 0.. = Observable.deferred { - count++ + count += 1 return Observable.create { obs in return AnonymousDisposable { disconnected = true @@ -163,7 +163,7 @@ extension ObservableBindingTest { XCTAssertFalse(disconnected) dis3.dispose() - XCTAssertTrue(disconnected); + XCTAssertTrue(disconnected) } func testRefCount_Error() { @@ -301,7 +301,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 5), @@ -352,7 +352,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 5), @@ -404,7 +404,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 5), @@ -459,7 +459,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 5), @@ -512,7 +512,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 7), @@ -561,7 +561,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 7), @@ -611,7 +611,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 7), @@ -664,7 +664,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 7), @@ -715,7 +715,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 3), @@ -771,7 +771,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 8), @@ -824,7 +824,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(500) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 8), @@ -880,7 +880,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(650) { connection = ys.connect() } scheduler.scheduleAt(800) { connection.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res.events, [ next(450, 4), @@ -913,7 +913,7 @@ extension ObservableBindingTest { let observable = transform(Observable.of(0, 1, 2)) _ = observable.subscribeNext { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 3) @@ -926,7 +926,7 @@ extension ObservableBindingTest { let observable = transform(Observable.empty()) _ = observable.subscribeCompleted { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -939,7 +939,7 @@ extension ObservableBindingTest { let observable = transform(Observable.error(testError)) _ = observable.subscribeError { _ in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -952,7 +952,7 @@ extension ObservableBindingTest { let observable = transform([Observable.of(0, 1, 2), Observable.error(testError)].concat()) _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -999,7 +999,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1068,7 +1068,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1134,7 +1134,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1194,7 +1194,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1223,7 +1223,7 @@ extension ObservableBindingTest { let observable = Observable.of(0, 1, 2).shareReplayLatestWhileConnected() _ = observable.subscribeNext { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 3) @@ -1234,7 +1234,7 @@ extension ObservableBindingTest { let observable = Observable.empty().shareReplayLatestWhileConnected() _ = observable.subscribeCompleted { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1245,7 +1245,7 @@ extension ObservableBindingTest { let observable = Observable.error(testError).shareReplayLatestWhileConnected() _ = observable.subscribeError { _ in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1256,7 +1256,7 @@ extension ObservableBindingTest { let observable = [Observable.of(0, 1, 2), Observable.error(testError)].concat().shareReplayLatestWhileConnected() _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1301,7 +1301,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1367,7 +1367,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch @@ -1431,7 +1431,7 @@ extension ObservableBindingTest { scheduler.scheduleAt(440) { subscription1 = ys.subscribe(res1) } scheduler.scheduleAt(455) { subscription1.dispose() } - scheduler.start(); + scheduler.start() XCTAssertEqual(res1.events, [ // 1rt batch diff --git a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift index 3bbddcbf..5887f340 100644 --- a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift @@ -129,7 +129,7 @@ extension ObservableConcurrencyTest { runDispatchQueueSchedulerTests { scheduler in let observable: Observable = Observable.error(testError).observeOn(scheduler) return observable .subscribeError { n in - nEvents++ + nEvents += 1 } } @@ -143,7 +143,7 @@ extension ObservableConcurrencyTest { let observable: Observable = Observable.empty().observeOn(scheduler) return observable.subscribeCompleted { - nEvents++ + nEvents += 1 } } @@ -343,7 +343,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas } condition.lock() - writtenStarted++ + writtenStarted += 1 condition.signal() while writtenStarted < 2 { condition.wait() @@ -355,7 +355,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas } condition.lock() - writtenEnded++ + writtenEnded += 1 condition.signal() while writtenEnded < 2 { condition.wait() diff --git a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift index 86c36d28..1aea95ea 100644 --- a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift @@ -256,7 +256,7 @@ extension ObservableCreationTests { var elements = [Int]() _ = Observable.generate(0, condition: { _ in true }) { x in - count++ + count += 1 return x + 1 } .take(4) diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift index f7874238..4e34ec44 100644 --- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift @@ -1563,7 +1563,7 @@ extension ObservableMultipleTest { ).merge() _ = observable.subscribeNext { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 9) @@ -1579,7 +1579,7 @@ extension ObservableMultipleTest { ).merge() _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1593,7 +1593,7 @@ extension ObservableMultipleTest { ).merge() _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1604,7 +1604,7 @@ extension ObservableMultipleTest { let observable: Observable = Observable>.empty().merge() _ = observable.subscribeCompleted { - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1615,7 +1615,7 @@ extension ObservableMultipleTest { let observable: Observable = Observable.just(Observable.empty()).merge() _ = observable.subscribeCompleted { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1631,7 +1631,7 @@ extension ObservableMultipleTest { ).merge(maxConcurrent: 1) _ = observable.subscribeNext { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 9) @@ -1647,7 +1647,7 @@ extension ObservableMultipleTest { ).merge(maxConcurrent: 1) _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1661,7 +1661,7 @@ extension ObservableMultipleTest { ).merge(maxConcurrent: 1) _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1673,7 +1673,7 @@ extension ObservableMultipleTest { let observable: Observable = Observable>.empty().merge(maxConcurrent: 1) _ = observable.subscribeCompleted { - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -1685,7 +1685,7 @@ extension ObservableMultipleTest { let observable: Observable = Observable.just(Observable.empty()).merge(maxConcurrent: 1) _ = observable.subscribeCompleted { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -2505,7 +2505,7 @@ extension ObservableMultipleTest { let observable = Observable.combineLatest(Observable.of(0, 1, 2), Observable.of(0, 1, 2)) { $0 + $1 } _ = observable.subscribeNext { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 3) @@ -2520,7 +2520,7 @@ extension ObservableMultipleTest { ) { $0 + $1 } _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -2535,7 +2535,7 @@ extension ObservableMultipleTest { ) { $0 + $1 } _ = observable.subscribeError { n in - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) @@ -2551,7 +2551,7 @@ extension ObservableMultipleTest { ) { $0 + $1 } _ = observable.subscribeCompleted { - nEvents++ + nEvents += 1 } XCTAssertEqual(nEvents, 1) diff --git a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift index 15bf0972..0dd58215 100644 --- a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift @@ -295,7 +295,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next: - i++ + i += 1 sum -= e.element ?? 0 default: break @@ -338,7 +338,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next(_): - i++ + i += 1 default: break } } @@ -380,7 +380,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next(let value): - i++ + i += 1 sum -= value case .Completed: completedEvaluation = true @@ -422,7 +422,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next(_): - i++ + i += 1 case .Completed: completedEvaluation = true default: break @@ -462,7 +462,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next(let value): - i++ + i += 1 sum -= value case .Error: sawError = true @@ -509,7 +509,7 @@ extension ObservableSingleTest { let res = scheduler.start { xs.doOn { e in switch e { case .Next(let value): - i++ + i += 1 sum -= value case .Error: sawError = true @@ -776,7 +776,7 @@ extension ObservableSingleTest { observer.on(.Next(2)) if count < 2 { observer.on(.Error(testError)) - count++ + count += 1 } observer.on(.Next(3)) observer.on(.Next(4)) @@ -957,7 +957,8 @@ extension ObservableSingleTest { let res = scheduler.start(300) { xs.retryWhen { (errors: Observable) in return errors.scan(0) { (var a, e) in - if ++a == 2 { + a += 1 + if a == 2 { throw testError1 } return a @@ -1167,7 +1168,7 @@ extension ObservableSingleTest { observer.on(.Next(2)) if count < 2 { observer.on(.Error(testError)) - count++ + count += 1 } observer.on(.Next(3)) observer.on(.Next(4)) diff --git a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift index 8412c6db..8fd0a94d 100644 --- a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift @@ -63,7 +63,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.filter { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num); } } @@ -105,7 +105,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.filter { (num: Int) -> Bool in - invoked++ + invoked += 1 return true } } @@ -152,7 +152,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.filter { (num: Int) -> Bool in - invoked++ + invoked += 1 return false } } @@ -190,7 +190,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start(400) { () -> Observable in return xs.filter { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -234,7 +234,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -276,7 +276,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -320,7 +320,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -360,7 +360,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -403,7 +403,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start(300) { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -443,7 +443,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start(400) { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -487,7 +487,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start(300) { () -> Observable in return xs.takeWhile { (num: Int) -> Bool in - invoked++; + invoked += 1 return isPrime(num) } } @@ -525,7 +525,7 @@ extension ObservableStandardSequenceOperatorsTest { let res = scheduler.start() { () -> Observable in return xs.takeWhile { num in - invoked++ + invoked += 1 if invoked == 3 { throw testError @@ -1797,7 +1797,7 @@ extension ObservableStandardSequenceOperatorsTest { var invoked = 0 let res = scheduler.start { return xs.flatMapFirst { (x: ColdObservable) -> ColdObservable in - invoked++ + invoked += 1 if invoked == 2 { throw testError } @@ -2426,7 +2426,7 @@ extension ObservableStandardSequenceOperatorsTest { var invoked = 0 let res = scheduler.start { return xs.flatMap { (x: ColdObservable) -> ColdObservable in - invoked++ + invoked += 1 if invoked == 3 { throw testError } @@ -3095,7 +3095,7 @@ extension ObservableStandardSequenceOperatorsTest { var invoked = 0 let res = scheduler.start { return xs.flatMapWithIndex { (x: ColdObservable, _: Int) -> ColdObservable in - invoked++ + invoked += 1 if invoked == 3 { throw testError } diff --git a/Tests/RxSwiftTests/Tests/Observable+SubscriptionTest.swift b/Tests/RxSwiftTests/Tests/Observable+SubscriptionTest.swift index 6d1bc977..39b838c2 100644 --- a/Tests/RxSwiftTests/Tests/Observable+SubscriptionTest.swift +++ b/Tests/RxSwiftTests/Tests/Observable+SubscriptionTest.swift @@ -24,14 +24,14 @@ class ObservableSubscriptionTests : RxTest { let subscription = publishSubject.subscribe(onNext: { n in lastElement = n - onNextCalled++ + onNextCalled += 1 }, onError: { e in lastError = e - onErrorCalled++ + onErrorCalled += 1 }, onCompleted: { - onCompletedCalled++ + onCompletedCalled += 1 }, onDisposed: { - onDisposedCalled++ + onDisposedCalled += 1 }) XCTAssertTrue(lastElement == nil) @@ -74,14 +74,14 @@ class ObservableSubscriptionTests : RxTest { let subscription = publishSubject.subscribe(onNext: { n in lastElement = n - onNextCalled++ + onNextCalled += 1 }, onError: { e in lastError = e - onErrorCalled++ + onErrorCalled += 1 }, onCompleted: { - onCompletedCalled++ + onCompletedCalled += 1 }, onDisposed: { - onDisposedCalled++ + onDisposedCalled += 1 }) XCTAssertTrue(lastElement == nil) @@ -125,14 +125,14 @@ class ObservableSubscriptionTests : RxTest { let subscription = publishSubject.subscribe(onNext: { n in lastElement = n - onNextCalled++ + onNextCalled += 1 }, onError: { e in lastError = e - onErrorCalled++ + onErrorCalled += 1 }, onCompleted: { - onCompletedCalled++ + onCompletedCalled += 1 }, onDisposed: { - onDisposedCalled++ + onDisposedCalled += 1 }) XCTAssertTrue(lastElement == nil) @@ -176,14 +176,14 @@ class ObservableSubscriptionTests : RxTest { let subscription = publishSubject.subscribe(onNext: { n in lastElement = n - onNextCalled++ + onNextCalled += 1 }, onError: { e in lastError = e - onErrorCalled++ + onErrorCalled += 1 }, onCompleted: { - onCompletedCalled++ + onCompletedCalled += 1 }, onDisposed: { - onDisposedCalled++ + onDisposedCalled += 1 }) XCTAssertTrue(lastElement == nil)