Skip to content

Commit f85490d

Browse files
phauslerphausler
committed
Revert "Revert "Tests for NSTimer": this does not build for linux currently."
These tests are now able to build correctly This reverts commit ae74a3f.
1 parent d4ae9bf commit f85490d

File tree

6 files changed

+114
-2
lines changed

6 files changed

+114
-2
lines changed

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
5BF7AEC11BCD51F9008F214A /* NSValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDC3F4C1BCC5DCB00ED97BB /* NSValue.swift */; };
202202
5E5835F41C20C9B500C81317 /* TestNSThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E5835F31C20C9B500C81317 /* TestNSThread.swift */; };
203203
612952F91C1B235900BE0FD9 /* TestNSNull.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612952F81C1B235900BE0FD9 /* TestNSNull.swift */; };
204+
61D6C9EF1C1DFE9500DEF583 /* TestNSTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D6C9EE1C1DFE9500DEF583 /* TestNSTimer.swift */; };
204205
61E0117C1C1B554D000037DD /* TestNSRunLoop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61E0117B1C1B554D000037DD /* TestNSRunLoop.swift */; };
205206
61E0117D1C1B5590000037DD /* NSRunLoop.swift in Sources */ = {isa = PBXBuildFile; fileRef = EADE0B761BD15DFF00C49C64 /* NSRunLoop.swift */; };
206207
61E0117E1C1B55B9000037DD /* NSTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDC3F481BCC5DCB00ED97BB /* NSTimer.swift */; };
@@ -550,6 +551,7 @@
550551
5E5835F31C20C9B500C81317 /* TestNSThread.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSThread.swift; sourceTree = "<group>"; };
551552
5EB6A15C1C188FC40037DCB8 /* TestNSJSONSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSJSONSerialization.swift; sourceTree = "<group>"; };
552553
612952F81C1B235900BE0FD9 /* TestNSNull.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSNull.swift; sourceTree = "<group>"; };
554+
61D6C9EE1C1DFE9500DEF583 /* TestNSTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSTimer.swift; sourceTree = "<group>"; };
553555
61E0117B1C1B554D000037DD /* TestNSRunLoop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSRunLoop.swift; sourceTree = "<group>"; };
554556
61F8AE7C1C180FC600FB62F0 /* TestNSNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSNotificationCenter.swift; sourceTree = "<group>"; };
555557
6E203B8C1C1303BB003B2576 /* TestNSBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSBundle.swift; sourceTree = "<group>"; };
@@ -1082,6 +1084,12 @@
10821084
EA66F6411BF1619600136161 /* TestNSSet.swift */,
10831085
EA66F6421BF1619600136161 /* TestNSString.swift */,
10841086
5E5835F31C20C9B500C81317 /* TestNSThread.swift */,
1087+
C2A9D75B1C15C08B00993803 /* TestNSUUID.swift */,
1088+
EA66F6431BF1619600136161 /* TestNSURL.swift */,
1089+
5B40F9F11C125187000E72E3 /* TestNSXMLParser.swift */,
1090+
22B9C1E01C165D7A00DECFF9 /* TestNSDate.swift */,
1091+
DCDBB8321C1768AC00313299 /* TestNSData.swift */,
1092+
61D6C9EE1C1DFE9500DEF583 /* TestNSTimer.swift */,
10851093
84BA558D1C16F90900F48C54 /* TestNSTimeZone.swift */,
10861094
EA66F6431BF1619600136161 /* TestNSURL.swift */,
10871095
83712C8D1C1684900049AD49 /* TestNSURLRequest.swift */,
@@ -1822,6 +1830,7 @@
18221830
ED58F76F1C134B3A00E6A5BE /* TestNSJSONSerialization.swift in Sources */,
18231831
AA664D4F1C1B03CA00C22186 /* TestNSNumberFormatter.swift in Sources */,
18241832
EA66F6581BF1619600136161 /* TestNSURL.swift in Sources */,
1833+
61D6C9EF1C1DFE9500DEF583 /* TestNSTimer.swift in Sources */,
18251834
61E0117C1C1B554D000037DD /* TestNSRunLoop.swift in Sources */,
18261835
EA66F6441BF1619600136161 /* main.swift in Sources */,
18271836
);

‎Foundation/NSRunLoop.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ extension NSRunLoop {
7474

7575
public func runMode(mode: String, beforeDate limitDate: NSDate) -> Bool {
7676
let runloopResult = CFRunLoopRunInMode(mode._cfObject, limitDate.timeIntervalSinceNow, false)
77+
#if os(Linux)
7778
return runloopResult == 2 || runloopResult == 3
79+
#else
80+
return runloopResult == .HandledSource || runloopResult == .TimedOut
81+
#endif
7882
}
7983

8084
}

‎Foundation/NSSwiftRuntime.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ internal func __CFInitializeSwift() {
121121
// _CFRuntimeBridgeTypeToClass(CFAttributedStringGetTypeID(), unsafeBitCast(NSMutableAttributedString.self, UnsafePointer<Void>.self))
122122
// _CFRuntimeBridgeTypeToClass(CFReadStreamGetTypeID(), unsafeBitCast(NSInputStream.self, UnsafePointer<Void>.self))
123123
// _CFRuntimeBridgeTypeToClass(CFWriteStreamGetTypeID(), unsafeBitCast(NSOutputStream.self, UnsafePointer<Void>.self))
124-
// _CFRuntimeBridgeTypeToClass(CFRunLoopTimerGetTypeID(), unsafeBitCast(NSTimer.self, UnsafePointer<Void>.self))
124+
_CFRuntimeBridgeTypeToClass(CFRunLoopTimerGetTypeID(), unsafeBitCast(NSTimer.self, UnsafePointer<Void>.self))
125125

126126
__CFSwiftBridge.NSObject.isEqual = _CFSwiftIsEqual
127127
__CFSwiftBridge.NSObject.hash = _CFSwiftGetHash

‎TestFoundation/TestNSTimer.swift

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
// This source file is part of the Swift.org open source project
2+
//
3+
// Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
4+
// Licensed under Apache License v2.0 with Runtime Library Exception
5+
//
6+
// See http://swift.org/LICENSE.txt for license information
7+
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
8+
//
9+
10+
11+
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
12+
import Foundation
13+
import XCTest
14+
#else
15+
import SwiftFoundation
16+
import SwiftXCTest
17+
#endif
18+
19+
20+
class TestNSTimer : XCTestCase {
21+
var allTests : [(String, () -> ())] {
22+
return [
23+
("test_timerInit", test_timerInit),
24+
("test_timerTickOnce", test_timerTickOnce),
25+
("test_timerRepeats", test_timerRepeats),
26+
("test_timerInvalidate", test_timerInvalidate),
27+
]
28+
}
29+
30+
func test_timerInit() {
31+
let timer = NSTimer(fireDate: NSDate(), interval: 0.3, repeats: false) { _ in }
32+
XCTAssertNotNil(timer)
33+
}
34+
35+
func test_timerTickOnce() {
36+
var flag = false
37+
38+
let dummyTimer = NSTimer.scheduledTimer(0.01, repeats: false) { timer in
39+
XCTAssertFalse(flag)
40+
41+
flag = true
42+
timer.invalidate()
43+
}
44+
45+
let runLoop = NSRunLoop.currentRunLoop()
46+
runLoop.addTimer(dummyTimer, forMode: NSDefaultRunLoopMode)
47+
runLoop.runUntilDate(NSDate(timeIntervalSinceNow: 0.05))
48+
49+
XCTAssertTrue(flag)
50+
}
51+
52+
func test_timerRepeats() {
53+
var flag = 0
54+
let interval = NSTimeInterval(0.1)
55+
let numberOfRepeats = 3
56+
var previousInterval = NSDate().timeIntervalSince1970
57+
58+
let dummyTimer = NSTimer.scheduledTimer(interval, repeats: true) { timer in
59+
XCTAssertEqual(timer.timeInterval, interval)
60+
61+
let currentInterval = NSDate().timeIntervalSince1970
62+
XCTAssertEqualWithAccuracy(currentInterval, previousInterval + interval, accuracy: 0.01)
63+
previousInterval = currentInterval
64+
65+
flag += 1
66+
if (flag == numberOfRepeats) {
67+
timer.invalidate()
68+
}
69+
}
70+
71+
let runLoop = NSRunLoop.currentRunLoop()
72+
runLoop.addTimer(dummyTimer, forMode: NSDefaultRunLoopMode)
73+
runLoop.runUntilDate(NSDate(timeIntervalSinceNow: interval * Double(numberOfRepeats + 1)))
74+
75+
XCTAssertEqual(flag, numberOfRepeats)
76+
}
77+
78+
func test_timerInvalidate() {
79+
var flag = false
80+
81+
let dummyTimer = NSTimer.scheduledTimer(0.01, repeats: true) { timer in
82+
XCTAssertTrue(timer.valid)
83+
XCTAssertFalse(flag) // timer should tick only once
84+
85+
flag = true
86+
87+
timer.invalidate()
88+
XCTAssertFalse(timer.valid)
89+
}
90+
91+
let runLoop = NSRunLoop.currentRunLoop()
92+
runLoop.addTimer(dummyTimer, forMode: NSDefaultRunLoopMode)
93+
runLoop.runUntilDate(NSDate(timeIntervalSinceNow: 0.05))
94+
95+
XCTAssertTrue(flag)
96+
}
97+
98+
}

‎TestFoundation/main.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ XCTMain([
4848
TestNSSet(),
4949
TestNSString(),
5050
TestNSThread(),
51+
TestNSTimer(),
5152
TestNSTimeZone(),
5253
TestNSURL(),
5354
TestNSURLComponents(),

‎build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@
245245

246246
swift_sources = CompileSwiftSources([
247247
'Foundation/NSObject.swift',
248-
'Foundation/NSRunLoop.swift',
249248
'Foundation/NSAffineTransform.swift',
250249
'Foundation/NSArray.swift',
251250
'Foundation/NSAttributedString.swift',
@@ -307,6 +306,7 @@
307306
'Foundation/NSPropertyList.swift',
308307
'Foundation/NSRange.swift',
309308
'Foundation/NSRegularExpression.swift',
309+
'Foundation/NSRunLoop.swift',
310310
'Foundation/NSScanner.swift',
311311
'Foundation/NSSet.swift',
312312
'Foundation/NSSortDescriptor.swift',

0 commit comments

Comments
 (0)