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

Linux fixes.

This commit is contained in:
Krunoslav Zaher 2015-12-25 23:33:25 +01:00
parent e2819880f0
commit d377f61794
6 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RxBlocking/RunLoopLock.swift
View File

@ -11,10 +11,10 @@ import Foundation
import RxSwift
#endif
class RunLoopLock : NSObject {
class RunLoopLock {
let currentRunLoop: CFRunLoopRef
override init() {
init() {
currentRunLoop = CFRunLoopGetCurrent()
}

24
Tests/RxSwiftTests/Tests/ConcurrencyTest.swift
View File

@ -1,24 +0,0 @@
//
// ConcurrencyTest.swift
// Rx
//
// Created by Krunoslav Zaher on 2/12/15.
// Copyright (c) 2015 Krunoslav Zaher. All rights reserved.
//
import Foundation
import Foundation
import XCTest
import RxSwift
class ConcurrencyTest : XCTestCase {
override func setUp() {
super.setUp()
}
override func tearDown() {
super.tearDown()
}
}

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

@ -10,6 +10,9 @@ import Foundation
import XCTest
import RxSwift
import RxTests
#if os(Linux)
import Glibc
#endif
class ObservableStandardSequenceOperatorsTest : RxTest {
override func setUp() {
@ -26,7 +29,7 @@ func isPrime(i: Int) -> Bool {
return false
}
let max = Int(sqrt(Float(i)))
let max = Int(sqrt(Double(i)))
if max <= 1 {
return true
}

7
Tests/RxSwiftTests/Tests/ObserverTests.swift
View File

@ -6,6 +6,7 @@
//
//
import Foundation
import XCTest
import RxSwift
@ -41,12 +42,12 @@ extension ObserverTests {
}
var elements = [Int]()
var errrorNotification: NSError!
var errorNotification: ErrorType!
_ = a.subscribe(
onNext: { n in elements.append(n) },
onError: { e in
errrorNotification = e as NSError
errorNotification = e
}
)
@ -59,7 +60,7 @@ extension ObserverTests {
observer.onNext(1)
XCTAssertEqual(elements, [0])
XCTAssertEqual(errrorNotification, testError)
XCTAssertErrorEqual(errorNotification, testError)
}
func testConvenienceOn_Complete() {

8
Tests/Tests.xcodeproj/project.pbxproj
View File

@ -34,7 +34,6 @@
C81108531AF50E2A001C13E4 /* MySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108341AF50E2A001C13E4 /* MySubject.swift */; };
C81108541AF50E2A001C13E4 /* Observable.Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */; };
C811085D1AF50E2A001C13E4 /* AssumptionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */; };
C811085E1AF50E2A001C13E4 /* ConcurrencyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */; };
C811085F1AF50E2A001C13E4 /* DisposableTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108421AF50E2A001C13E4 /* DisposableTest.swift */; };
C81108601AF50E2A001C13E4 /* Observable+AggregateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */; };
C81108611AF50E2A001C13E4 /* Observable+BindingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */; };
@ -77,7 +76,6 @@
C88BB8991B07E64B0064D411 /* Observable+BindingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */; };
C88BB89A1B07E64B0064D411 /* NSNotificationCenterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C811082B1AF50E2A001C13E4 /* NSNotificationCenterTests.swift */; };
C88BB89B1B07E64B0064D411 /* Observable+MultipleTest+CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108451AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift */; };
C88BB89C1B07E64B0064D411 /* ConcurrencyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */; };
C88BB89F1B07E64B0064D411 /* DisposableTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108421AF50E2A001C13E4 /* DisposableTest.swift */; };
C88BB8A01B07E64B0064D411 /* Observable+StandardSequenceOperatorsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108491AF50E2A001C13E4 /* Observable+StandardSequenceOperatorsTest.swift */; };
C88BB8A11B07E64B0064D411 /* Observable+MultipleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108471AF50E2A001C13E4 /* Observable+MultipleTest.swift */; };
@ -178,7 +176,6 @@
D2EBEB641BB9B7EF003A27DC /* AssumptionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */; };
D2EBEB651BB9B7EF003A27DC /* BagTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C84B8FC11B89D0D500C9CCCF /* BagTest.swift */; };
D2EBEB661BB9B7EF003A27DC /* BehaviorSubjectTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C897EC3A1B10E000009C2CB0 /* BehaviorSubjectTest.swift */; };
D2EBEB681BB9B7EF003A27DC /* ConcurrencyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */; };
D2EBEB6A1BB9B7EF003A27DC /* DisposableTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108421AF50E2A001C13E4 /* DisposableTest.swift */; };
D2EBEB6B1BB9B7EF003A27DC /* Observable+AggregateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */; };
D2EBEB6C1BB9B7EF003A27DC /* Observable+BindingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */; };
@ -215,7 +212,6 @@
C81108341AF50E2A001C13E4 /* MySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySubject.swift; sourceTree = "<group>"; };
C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observable.Extensions.swift; sourceTree = "<group>"; };
C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AssumptionsTest.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrencyTest.swift; sourceTree = "<group>"; };
C81108421AF50E2A001C13E4 /* DisposableTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableTest.swift; sourceTree = "<group>"; };
C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+AggregateTest.swift"; sourceTree = "<group>"; };
C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+BindingTest.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@ -447,7 +443,6 @@
C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */,
C84B8FC11B89D0D500C9CCCF /* BagTest.swift */,
C897EC3A1B10E000009C2CB0 /* BehaviorSubjectTest.swift */,
C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */,
C81108421AF50E2A001C13E4 /* DisposableTest.swift */,
C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */,
C81108441AF50E2A001C13E4 /* Observable+BindingTest.swift */,
@ -649,7 +644,6 @@
C811084D1AF50E2A001C13E4 /* NSNotificationCenterTests.swift in Sources */,
C8C4B4D81C1772D700828BD5 /* RXObjCRuntime+Testing.m in Sources */,
C81108621AF50E2A001C13E4 /* Observable+MultipleTest+CombineLatest.swift in Sources */,
C811085E1AF50E2A001C13E4 /* ConcurrencyTest.swift in Sources */,
C87EC2FD1C131A6F0060B19B /* DelegateProxyTest+UIKit.swift in Sources */,
C8CDD7D41B52BEC40043F0C5 /* Observable+BlockingTest.swift in Sources */,
C81CC92B1B513FD400915606 /* NSObject+RxTests.swift in Sources */,
@ -719,7 +713,6 @@
C88BB89B1B07E64B0064D411 /* Observable+MultipleTest+CombineLatest.swift in Sources */,
C8941BDA1BD4F58C00A0E874 /* BackgroundThreadPrimitiveHotObservable.swift in Sources */,
C8CF47671C1DA04700C3FA6E /* CLLocationManager+RxTests.swift in Sources */,
C88BB89C1B07E64B0064D411 /* ConcurrencyTest.swift in Sources */,
C87EC3001C131A940060B19B /* DelegateProxyTest+Cocoa.swift in Sources */,
C8C4B4D91C1772D700828BD5 /* RXObjCRuntime+Testing.m in Sources */,
C88BB89F1B07E64B0064D411 /* DisposableTest.swift in Sources */,
@ -794,7 +787,6 @@
D2EBEB771BB9B7F9003A27DC /* VariableTest.swift in Sources */,
D2EBEB781BB9B7F9003A27DC /* ObserverTests.swift in Sources */,
D203C4EB1BB9C22800D02D00 /* NSNotificationCenterTests.swift in Sources */,
D2EBEB681BB9B7EF003A27DC /* ConcurrencyTest.swift in Sources */,
D2EBEB721BB9B7F6003A27DC /* Observable+MultipleTest+Zip.swift in Sources */,
D2EBEB731BB9B7F9003A27DC /* Observable+SingleTest.swift in Sources */,
C8F6A1431BEFE04F007DF367 /* SubjectConcurrencyTest.swift in Sources */,

28
Tests/Tests/XCTest+Rx.swift
View File

@ -18,10 +18,21 @@ func XCTAssertErrorEqual(lhs: ErrorType, _ rhs: ErrorType) {
XCTAssertTrue(event1 == event2)
}
func XCTAssertEqualNSValues(lhs: AnyObject, rhs: AnyObject) {
let pointerValuesAreEqual = (lhs as? NSValue)?.pointerValue == (rhs as? NSValue)?.pointerValue
let areEqual = lhs.isEqual(rhs) || pointerValuesAreEqual
func NSValuesAreEqual(lhs: AnyObject, _ rhs: AnyObject) -> Bool {
if let lhsValue = lhs as? NSValue, rhsValue = rhs as? NSValue {
#if os(Linux)
return lhsValue.isEqual(rhsValue)
#else
return lhsValue.isEqual(rhsValue)
|| lhs.pointerValue == rhs.pointerValue
#endif
}
return false
}
func XCTAssertEqualNSValues(lhs: AnyObject, rhs: AnyObject) {
let areEqual = NSValuesAreEqual(lhs, rhs)
XCTAssertTrue(areEqual)
if !areEqual {
print(lhs)
@ -36,16 +47,7 @@ func XCTAssertEqualAnyObjectArrayOfArrays(lhs: [[AnyObject]], _ rhs: [[AnyObject
}
return zip(lhs, rhs).reduce(true) { acc, n in
let pointerValuesAreEqual: Bool
#if !os(Linux)
if let firstPointer = (n.0 as? NSValue)?.pointerValue, secondPointer = (n.1 as? NSValue)?.pointerValue {
pointerValuesAreEqual = firstPointer == secondPointer
}
else {
pointerValuesAreEqual = false
}
#endif
let res = n.0.isEqual(n.1) || pointerValuesAreEqual
let res = (n.0 as! NSObject).isEqual(n.1) || NSValuesAreEqual(n.0, n.1)
return acc && res
}
}