Skip to content

Commit 467acfe

Browse files
committed
TimeInterval -> NSTimeInterval
1 parent bd5e3f8 commit 467acfe

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Sources/XCTest/XCTestMain.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414

1515
#if os(Linux) || os(FreeBSD)
1616
import Glibc
17+
import Foundation
1718
#else
1819
import Darwin
20+
import SwiftFoundation
1921
#endif
2022

2123
internal func XCTPrint(message: String) {
@@ -36,7 +38,7 @@ struct XCTFailure {
3638
}
3739

3840
internal struct XCTRun {
39-
var duration: TimeInterval
41+
var duration: NSTimeInterval
4042
var method: String
4143
var passed: Bool
4244
var failures: [XCTFailure]

Sources/XCTest/XCTimeUtilities.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313

1414
#if os(Linux) || os(FreeBSD)
1515
import Glibc
16+
import Foundation
1617
#else
1718
import Darwin
19+
import SwiftFoundation
1820
#endif
1921

20-
internal typealias TimeInterval = Double
21-
2222
/// Returns the number of seconds since the reference time as a Double.
23-
private func currentTimeIntervalSinceReferenceTime() -> TimeInterval {
23+
private func currentTimeIntervalSinceReferenceTime() -> NSTimeInterval {
2424
var tv = timeval()
25-
let currentTime = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> TimeInterval in
25+
let currentTime = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> NSTimeInterval in
2626
gettimeofday(t, nil)
27-
return TimeInterval(t.pointee.tv_sec) + TimeInterval(t.pointee.tv_usec) / 1000000.0
27+
return NSTimeInterval(t.pointee.tv_sec) + NSTimeInterval(t.pointee.tv_usec) / 1000000.0
2828
})
2929
return currentTime
3030
}
3131

3232
/// Execute the given block and return the time spent during execution
33-
internal func measureTimeExecutingBlock(@noescape block: () -> Void) -> TimeInterval {
33+
internal func measureTimeExecutingBlock(@noescape block: () -> Void) -> NSTimeInterval {
3434
let start = currentTimeIntervalSinceReferenceTime()
3535
block()
3636
let end = currentTimeIntervalSinceReferenceTime()
@@ -39,6 +39,6 @@ internal func measureTimeExecutingBlock(@noescape block: () -> Void) -> TimeInte
3939
}
4040

4141
/// Returns a string version of the given time interval rounded to no more than 3 decimal places.
42-
internal func printableStringForTimeInterval(timeInterval: TimeInterval) -> String {
42+
internal func printableStringForTimeInterval(timeInterval: NSTimeInterval) -> String {
4343
return String(round(timeInterval * 1000.0) / 1000.0)
4444
}

0 commit comments

Comments
 (0)