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

Fixes Swift 2.2 warnings.

This commit is contained in:
Krunoslav Zaher 2015-12-25 12:50:42 +01:00
parent 0a864f1f0c
commit 9cae95d3ef
31 changed files with 172 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/GettingStarted.md
View File

@ -403,7 +403,8 @@ func myInterval(interval: NSTimeInterval) -> Observable<Int> {
if cancel.disposed {
return
}
observer.on(.Next(next++))
observer.on(.Next(next))
next += 1
})
dispatch_resume(timer)

2
Rx.playground/Pages/Error_Handling_Operators.xcplaygroundpage/Contents.swift
View File

@ -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))

4
RxCocoa/Common/Observables/Implementations/KVOObservable.swift
View File

@ -100,11 +100,11 @@ func observeWeaklyKeyPathFor(
let propertyName = keyPathSections[0]
let remainingPaths = Array(keyPathSections[1..<keyPathSections.count])
let property = class_getProperty(object_getClass(target), propertyName);
let property = class_getProperty(object_getClass(target), propertyName)
if property == nil {
return Observable.error(RxCocoaError.InvalidPropertyName(object: target, propertyName: propertyName))
}
let propertyAttributes = property_getAttributes(property);
let propertyAttributes = property_getAttributes(property)
// should dealloc hook be in place if week property, or just create strong reference because it doesn't matter
let isWeak = isWeakProperty(String.fromCString(propertyAttributes) ?? "")

4
RxDataSourceStarterKit/Differentiator.swift
View File

@ -282,7 +282,7 @@ func differencesForSectionedView<S: SectionModelType where S: Hashable, S.Item:
}
else {
initialSectionInfos[i].indexAfterDelete = sectionIndexAfterDelete
sectionIndexAfterDelete++
sectionIndexAfterDelete += 1
}
}
@ -355,7 +355,7 @@ func differencesForSectionedView<S: SectionModelType where S: Hashable, S.Item:
}
initialItemInfos[i][j].indexAfterDelete = indexAfterDelete
indexAfterDelete++
indexAfterDelete += 1
}
else {
initialItemInfos[i][j].event = .Deleted

12
RxExample/RxExample.xcodeproj/project.pbxproj
View File

@ -355,6 +355,7 @@
C8C46DAC1B47F7110020D71E /* WikipediaSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C46DA71B47F7110020D71E /* WikipediaSearchViewController.swift */; };
C8C4B4BF1C17724A00828BD5 /* _RXObjCRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = C8C4B4BD1C17724A00828BD5 /* _RXObjCRuntime.m */; };
C8C4B4CC1C17728200828BD5 /* MessageSentObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C4B4CA1C17728200828BD5 /* MessageSentObserver.swift */; };
C8CCB8D41C2D5FBA000EDACC /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CCB8D31C2D5FBA000EDACC /* String+Rx.swift */; };
C8DF92CD1B0B2F84009BCF9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92C81B0B2F84009BCF9A /* AppDelegate.swift */; };
C8DF92DF1B0B328B009BCF9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DF92DE1B0B328B009BCF9A /* AppDelegate.swift */; };
C8DF92E31B0B32DA009BCF9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8DF92E01B0B32DA009BCF9A /* LaunchScreen.xib */; };
@ -819,6 +820,7 @@
C8C4B4BD1C17724A00828BD5 /* _RXObjCRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _RXObjCRuntime.m; sourceTree = "<group>"; };
C8C4B4BE1C17724A00828BD5 /* _RXObjCRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _RXObjCRuntime.h; sourceTree = "<group>"; };
C8C4B4CA1C17728200828BD5 /* MessageSentObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageSentObserver.swift; sourceTree = "<group>"; };
C8CCB8D31C2D5FBA000EDACC /* String+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Rx.swift"; sourceTree = "<group>"; };
C8DF92C81B0B2F84009BCF9A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C8DF92DE1B0B328B009BCF9A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C8DF92E01B0B32DA009BCF9A /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
@ -1197,6 +1199,7 @@
C89464271BC6C2B00055219D /* RxSwift */ = {
isa = PBXGroup;
children = (
C8CCB8D21C2D5FBA000EDACC /* Extensions */,
C89464281BC6C2B00055219D /* Cancelable.swift */,
C89464291BC6C2B00055219D /* Concurrency */,
C894642C1BC6C2B00055219D /* ConnectableObservableType.swift */,
@ -1582,6 +1585,14 @@
path = SimpleValidation;
sourceTree = "<group>";
};
C8CCB8D21C2D5FBA000EDACC /* Extensions */ = {
isa = PBXGroup;
children = (
C8CCB8D31C2D5FBA000EDACC /* String+Rx.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
C8DF92C71B0B2F84009BCF9A /* iOS */ = {
isa = PBXGroup;
children = (
@ -2069,6 +2080,7 @@
C8F6A1351BEF9DA3007DF367 /* SerialDispatchQueueScheduler.swift in Sources */,
C8297E4D1B6CF905000589EA /* RxTableViewSectionedReloadDataSource.swift in Sources */,
C89465931BC6C2BC0055219D /* UIDatePicker+Rx.swift in Sources */,
C8CCB8D41C2D5FBA000EDACC /* String+Rx.swift in Sources */,
C84CC58F1BDD486300E06A64 /* SynchronizedUnsubscribeType.swift in Sources */,
C8297E4E1B6CF905000589EA /* RxCollectionViewSectionedAnimatedDataSource.swift in Sources */,
C89CDB711BCC45E5002063D9 /* ShareReplay1.swift in Sources */,

6
RxSwift/DataStructures/Bag.swift
View File

@ -21,9 +21,9 @@ class Identity {
func hash(_x: Int) -> 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;
}

8
RxSwift/DataStructures/Queue.swift
View File

@ -114,7 +114,7 @@ public struct Queue<T>: SequenceType {
}
_storage[_pushNextIndex] = element
_pushNextIndex++
_pushNextIndex += 1
_count = _count + 1
if _pushNextIndex >= _storage.count {
@ -176,12 +176,14 @@ public struct Queue<T>: 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
}
}
}

4
RxSwift/Disposables/RefCountDisposable.swift
View File

@ -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()
}

6
RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift
View File

@ -43,7 +43,7 @@ class CombineLatestCollectionTypeSink<C: CollectionType, R, O: ObserverType wher
switch event {
case .Next(let element):
if _values[atIndex] == nil {
_numberOfValues++
_numberOfValues += 1
}
_values[atIndex] = element
@ -75,7 +75,7 @@ class CombineLatestCollectionTypeSink<C: CollectionType, R, O: ObserverType wher
}
_isDone[atIndex] = true
_numberOfDone++
_numberOfDone += 1
if _numberOfDone == self._parent._count {
forwardOn(.Completed)
@ -97,7 +97,7 @@ class CombineLatestCollectionTypeSink<C: CollectionType, R, O: ObserverType wher
self.on(event, atIndex: index)
})
j++
j += 1
}
return CompositeDisposable(disposables: _subscriptions.map { $0 })

6
RxSwift/Observables/Implementations/CombineLatest.swift
View File

@ -42,7 +42,7 @@ class CombineLatestSink<O: ObserverType>
func next(index: Int) {
if !_hasValue[index] {
_hasValue[index] = true
_numberOfValues++
_numberOfValues += 1
}
if _numberOfValues == _arity {
@ -58,7 +58,7 @@ class CombineLatestSink<O: ObserverType>
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<O: ObserverType>
}
_isDone[index] = true
_numberOfDone++
_numberOfDone += 1
if _numberOfDone == _arity {
forwardOn(.Completed)

2
RxSwift/Observables/Implementations/Skip.swift
View File

@ -32,7 +32,7 @@ class SkipCountSink<ElementType, O: ObserverType where O.E == ElementType> : Sin
forwardOn(.Next(value))
}
else {
remaining--
remaining -= 1
}
case .Error:
forwardOn(event)

2
RxSwift/Observables/Implementations/Take.swift
View File

@ -29,7 +29,7 @@ class TakeCountSink<ElementType, O: ObserverType where O.E == ElementType> : Sin
case .Next(let value):
if _remaining > 0 {
_remaining--
_remaining -= 1
forwardOn(.Next(value))

3
RxSwift/Observables/Implementations/Window.swift
View File

@ -75,7 +75,8 @@ class WindowTimeCountSink<Element, O: ObserverType where O.E == Observable<Eleme
if (_count == _parent._count) {
newWindow = true
_count = 0
newId = ++_windowId
_windowId += 1
newId = _windowId
self.startNewWindowAndCompleteCurrentOne()
}

8
RxSwift/Observables/Implementations/Zip+CollectionType.swift
View File

@ -45,7 +45,7 @@ class ZipCollectionTypeSink<C: CollectionType, R, O: ObserverType where C.Genera
_values[atIndex].enqueue(element)
if _values[atIndex].count == 1 {
_numberOfValues++
_numberOfValues += 1
}
if _numberOfValues < _parent.count {
@ -67,7 +67,7 @@ class ZipCollectionTypeSink<C: CollectionType, R, O: ObserverType where C.Genera
for i in 0 ..< _values.count {
arguments.append(_values[i].dequeue())
if _values[i].count > 0 {
_numberOfValues++
_numberOfValues += 1
}
}
@ -88,7 +88,7 @@ class ZipCollectionTypeSink<C: CollectionType, R, O: ObserverType where C.Genera
}
_isDone[atIndex] = true
_numberOfDone++
_numberOfDone += 1
if _numberOfDone == _parent.count {
self.forwardOn(.Completed)
@ -109,7 +109,7 @@ class ZipCollectionTypeSink<C: CollectionType, R, O: ObserverType where C.Genera
_subscriptions[j].disposable = source.subscribe(AnyObserver { event in
self.on(event, atIndex: index)
})
j++
j += 1
}
return CompositeDisposable(disposables: _subscriptions.map { $0 })

6
RxSwift/Observables/Implementations/Zip.swift
View File

@ -45,8 +45,8 @@ class ZipSink<O: ObserverType> : Sink<O>, ZipSinkProtocol {
for i in 0 ..< _arity {
if !hasElements(i) {
hasValueAll = false;
break;
hasValueAll = false
break
}
}
@ -64,7 +64,7 @@ class ZipSink<O: ObserverType> : Sink<O>, 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

2
RxTests/Schedulers/VirtualTimeSchedulerBase.swift
View File

@ -155,7 +155,7 @@ public class VirtualTimeSchedulerBase<C: VirtualTimeConverterType>
minIndex = index
}
index++
index += 1
}
if minElement != nil {

2
Tests/RxCocoaTests/DelegateProxyTest.swift
View File

@ -87,7 +87,7 @@ class DelegateProxyTest : RxTest {
let d = view.rx_proxy.observe("threeDView:didLearnSomething:")
.subscribeNext { n in
nMessages++
nMessages += 1
}
XCTAssertTrue(nMessages == 0)

4
Tests/RxCocoaTests/NSNotificationCenterTests.swift
View File

@ -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)

5
Tests/RxCocoaTests/SentMessageTest.swift
View File

@ -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
})
}
}

2
Tests/RxSwiftTests/TestImplementations/Mocks/MySubject.swift
View File

@ -46,7 +46,7 @@ class MySubject<Element where Element : Hashable> : SubjectType, ObserverType {
}
func subscribe<O : ObserverType where O.E == E>(observer: O) -> Disposable {
_subscribeCount++
_subscribeCount += 1
_observer = AnyObserver(observer)
return AnonymousDisposable {

2
Tests/RxSwiftTests/Tests/AssumptionsTest.swift
View File

@ -84,7 +84,7 @@ class AssumptionsTest : RxTest {
var count = 0
for _ in b {
a.removeAll()
count++
count += 1
}
XCTAssertTrue(count == 4)

28
Tests/RxSwiftTests/Tests/BagTest.swift
View File

@ -46,17 +46,17 @@ extension BagTest {
numberOfActionsAfter(i,
deletionsFromStart: j,
createNew: { () -> DoSomething in { () -> () in numberForEachActions++ } },
createNew: { () -> DoSomething in { () -> () in numberForEachActions += 1 } },
bagAction: { (bag: RxMutableBox<Bag<DoSomething>>) in bag.value.forEach { $0() }; XCTAssertTrue(bag.value.count == i - j) }
)
numberOfActionsAfter(i,
deletionsFromStart: j,
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers++ } },
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers += 1 } },
bagAction: { (bag: RxMutableBox<Bag<AnyObserver<Int>>>) 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<Bag<Disposable>>) 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<Bag<DoSomething>>) in bag.value.forEach { $0() }; XCTAssertTrue(bag.value.count == i - j) }
)
numberOfActionsAfter(i,
deletionsFromStart: j,
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers++ } },
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers += 1 } },
bagAction: { (bag: RxMutableBox<Bag<AnyObserver<Int>>>) 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<Bag<Disposable>>) 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<Bag<DoSomething>>) in bag.value.removeAll(); bag.value.forEach { $0() } }
)
numberOfActionsAfter(100,
deletionsFromStart: 0,
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers++ } },
createNew: { () -> AnyObserver<Int> in AnyObserver { _ in numberObservers += 1 } },
bagAction: { (bag: RxMutableBox<Bag<AnyObserver<Int>>>) 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<Bag<Disposable>>) in bag.value.removeAll(); disposeAllIn(bag.value); }
)
@ -194,7 +194,7 @@ extension BagTest {
var keys: [Bag<Disposable>.KeyType] = []
for _ in 0..<limit {
keys.append(bag.insert(AnonymousDisposable { increment++ }))
keys.append(bag.insert(AnonymousDisposable { increment += 1 }))
}
for i in 0..<limit {
@ -211,7 +211,7 @@ extension BagTest {
var keys: [Bag<Disposable>.KeyType] = []
for _ in 0..<limit {
keys.append(bag.insert(AnonymousDisposable { increment++ }))
keys.append(bag.insert(AnonymousDisposable { increment += 1 }))
}
for i in 0..<limit {

8
Tests/RxSwiftTests/Tests/BehaviorSubjectTest.swift
View File

@ -14,7 +14,7 @@ import RxTests
class BehaviorSubjectTest : RxTest {
func test_Infinite() {
let scheduler = TestScheduler(initialClock: 0);
let scheduler = TestScheduler(initialClock: 0)
let xs = scheduler.createHotObservable([
next(70, 1),
@ -79,7 +79,7 @@ class BehaviorSubjectTest : RxTest {
}
func test_Finite() {
let scheduler = TestScheduler(initialClock: 0);
let scheduler = TestScheduler(initialClock: 0)
let xs = scheduler.createHotObservable([
next(70, 1),
@ -142,7 +142,7 @@ class BehaviorSubjectTest : RxTest {
}
func test_Error() {
let scheduler = TestScheduler(initialClock: 0);
let scheduler = TestScheduler(initialClock: 0)
let xs = scheduler.createHotObservable([
next(70, 1),
@ -205,7 +205,7 @@ class BehaviorSubjectTest : RxTest {
}
func test_Canceled() {
let scheduler = TestScheduler(initialClock: 0);
let scheduler = TestScheduler(initialClock: 0)
let xs = scheduler.createHotObservable([
completed(630),

12
Tests/RxSwiftTests/Tests/DisposableTest.swift
View File

@ -74,11 +74,11 @@ class DisposableTest : RxTest {
let compositeDisposable = CompositeDisposable()
let result1 = compositeDisposable.addDisposable(AnonymousDisposable {
numberDisposed++
numberDisposed += 1
})
compositeDisposable.addDisposable(AnonymousDisposable {
numberDisposed++
numberDisposed += 1
})
XCTAssertEqual(numberDisposed, 0)
@ -90,7 +90,7 @@ class DisposableTest : RxTest {
XCTAssertEqual(compositeDisposable.count, 0)
let result = compositeDisposable.addDisposable(AnonymousDisposable {
numberDisposed++
numberDisposed += 1
})
XCTAssertEqual(numberDisposed, 3)
@ -103,11 +103,11 @@ class DisposableTest : RxTest {
let compositeDisposable = CompositeDisposable()
let result1 = compositeDisposable.addDisposable(AnonymousDisposable {
numberDisposed++
numberDisposed += 1
})
let result2 = compositeDisposable.addDisposable(AnonymousDisposable {
numberDisposed++
numberDisposed += 1
})
XCTAssertEqual(numberDisposed, 0)
@ -145,7 +145,7 @@ class DisposableTest : RxTest {
r.dispose()
XCTAssertEqual(d.disposed, true)
let d3 = r.retain();
let d3 = r.retain()
d3.dispose()
}

66
Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
View File

@ -24,7 +24,7 @@ extension ObservableBindingTest {
let observable = TestConnectableObservable(o: Observable.of(0, 1, 2), s: subject)
let d = observable.subscribeNext { n in
nEvents++
nEvents += 1
}
defer {
@ -43,7 +43,7 @@ extension ObservableBindingTest {
let observable = TestConnectableObservable(o: [Observable.of(0, 1, 2), Observable.error(testError)].concat(), s: subject)
let d = observable.subscribeError { n in
nEvents++
nEvents += 1
}
defer {
@ -62,7 +62,7 @@ extension ObservableBindingTest {
let observable = TestConnectableObservable(o: Observable.error(testError), s: subject)
let d = observable.subscribeError { n in
nEvents++
nEvents += 1
}
defer {
@ -81,7 +81,7 @@ extension ObservableBindingTest {
let observable = TestConnectableObservable(o: Observable.empty(), s: subject)
let d = observable.subscribeCompleted {
nEvents++
nEvents += 1
}
defer {
@ -128,7 +128,7 @@ extension ObservableBindingTest {
var count = 0
let xs: Observable<Int> = 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<Int>.empty().shareReplayLatestWhileConnected()
_ = observable.subscribeCompleted { n in
nEvents++
nEvents += 1
}
XCTAssertEqual(nEvents, 1)
@ -1245,7 +1245,7 @@ extension ObservableBindingTest {
let observable = Observable<Int>.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

8
Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
View File

@ -129,7 +129,7 @@ extension ObservableConcurrencyTest {
runDispatchQueueSchedulerTests { scheduler in
let observable: Observable<Int> = Observable.error(testError).observeOn(scheduler)
return observable .subscribeError { n in
nEvents++
nEvents += 1
}
}
@ -143,7 +143,7 @@ extension ObservableConcurrencyTest {
let observable: Observable<Int> = 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()

2
Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
View File

@ -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)

28
Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
View File

@ -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<Int> = Observable<Observable<Int>>.empty().merge()
_ = observable.subscribeCompleted {
nEvents++
nEvents += 1
}
XCTAssertEqual(nEvents, 1)
@ -1615,7 +1615,7 @@ extension ObservableMultipleTest {
let observable: Observable<Int> = 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<Int> = Observable<Observable<Int>>.empty().merge(maxConcurrent: 1)
_ = observable.subscribeCompleted {
nEvents++
nEvents += 1
}
XCTAssertEqual(nEvents, 1)
@ -1685,7 +1685,7 @@ extension ObservableMultipleTest {
let observable: Observable<Int> = 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)

19
Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
View File

@ -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<NSError>) 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))

30
Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
View File

@ -63,7 +63,7 @@ extension ObservableStandardSequenceOperatorsTest {
let res = scheduler.start { () -> Observable<Int> 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<Int> in
return xs.filter { (num: Int) -> Bool in
invoked++
invoked += 1
return true
}
}
@ -152,7 +152,7 @@ extension ObservableStandardSequenceOperatorsTest {
let res = scheduler.start { () -> Observable<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int> 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<Int>) -> ColdObservable<Int> 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<Int>) -> ColdObservable<Int> 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>, _: Int) -> ColdObservable<Int> in
invoked++
invoked += 1
if invoked == 3 {
throw testError
}

32
Tests/RxSwiftTests/Tests/Observable+SubscriptionTest.swift
View File

@ -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)