Add XCTimeUtilities.swift and factor two functions out for dealing with Doubles that represent 'time intervals'. This centralizes the weird rounding that is going on to try to format printed doubles with no more than 3 decimal places as well as encapsulating the use of timeval and gettimeofday.

Author: Mike Ferris

XCTest.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B108C2A71C20C15500F9F301 /* XCTimeUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */; };
 		B11FFA2A1C1603B6004297C2 /* XCTAssert.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA291C1603B6004297C2 /* XCTAssert.swift */; };
 		B11FFA2C1C160434004297C2 /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */; };
 		B11FFA2E1C16053C004297C2 /* XCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA2D1C16053C004297C2 /* XCTestCase.swift */; };
@@ -15,6 +16,7 @@
 
 /* Begin PBXFileReference section */
 		5B5D86DB1BBC74AD00234F36 /* SwiftXCTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftXCTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTimeUtilities.swift; sourceTree = "<group>"; };
 		B11FFA291C1603B6004297C2 /* XCTAssert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTAssert.swift; sourceTree = "<group>"; };
 		B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCaseProvider.swift; sourceTree = "<group>"; };
 		B11FFA2D1C16053C004297C2 /* XCTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCase.swift; sourceTree = "<group>"; };
@@ -63,6 +65,7 @@
 				B11FFA2D1C16053C004297C2 /* XCTestCase.swift */,
 				B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */,
 				B11FFA291C1603B6004297C2 /* XCTAssert.swift */,
+				B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */,
 			);
 			path = XCTest;
 			sourceTree = "<group>";
@@ -164,6 +167,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B108C2A71C20C15500F9F301 /* XCTimeUtilities.swift in Sources */,
 				EA6E86BB1BDEA7DE007C0323 /* XCTest.swift in Sources */,
 				B11FFA2C1C160434004297C2 /* XCTestCaseProvider.swift in Sources */,
 				B11FFA2E1C16053C004297C2 /* XCTestCase.swift in Sources */,

XCTest/XCTest.swift

@@ -58,7 +58,7 @@ internal struct XCTRun {
         failureSuffix = ""
     }
     let averageDuration = totalDuration / Double(XCTAllRuns.count)
-    print("Total executed \(XCTAllRuns.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) (\(totalUnexpectedFailures) unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
+    print("Total executed \(XCTAllRuns.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) (\(totalUnexpectedFailures) unexpected) in \(printableStringForTimeInterval(averageDuration)) (\(printableStringForTimeInterval(totalDuration))) seconds")
     exit(totalFailures > 0 ? 1 : 0)
 }
 

XCTest/XCTestCase.swift

@@ -11,12 +11,6 @@
 //  Base protocol (and extension with default methods) for test cases
 //
 
-#if os(Linux)
-    import Glibc
-#else
-    import Darwin
-#endif
-
 public protocol XCTestCase : XCTestCaseProvider {
 
 }
@@ -42,17 +36,10 @@ extension XCTestCase {
             let method = "\(self.dynamicType).\(name)"
             var duration: Double = 0.0
             print("Test Case '\(method)' started.")
-            var tv = timeval()
-            let start = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> Double in
-                gettimeofday(t, nil)
-                return Double(t.memory.tv_sec) + Double(t.memory.tv_usec) / 1000000.0
-            })
+            let start = currentTimeIntervalSinceReferenceTime()
 
             test()
-            let end = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> Double in
-                gettimeofday(t, nil)
-                return Double(t.memory.tv_sec) + Double(t.memory.tv_usec) / 1000000.0
-            })
+            let end = currentTimeIntervalSinceReferenceTime()
             duration = end - start
             totalDuration += duration
             for failure in XCTCurrentFailures {
@@ -66,7 +53,7 @@ extension XCTestCase {
             if XCTCurrentFailures.count > 0 {
                 result = "failed"
             }
-            print("Test Case '\(method)' \(result) (\(round(duration * 1000.0) / 1000.0) seconds).")
+            print("Test Case '\(method)' \(result) (\(printableStringForTimeInterval(duration)) seconds).")
             XCTAllRuns.append(XCTRun(duration: duration, method: method, passed: XCTCurrentFailures.count == 0, failures: XCTCurrentFailures))
             XCTCurrentFailures.removeAll()
             XCTCurrentTestCase = nil
@@ -81,8 +68,7 @@ extension XCTestCase {
         }
         let averageDuration = totalDuration / Double(tests.count)
 
-        
-        print("Executed \(tests.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) \(unexpectedFailures) unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
+        print("Executed \(tests.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) \(unexpectedFailures) unexpected) in \(printableStringForTimeInterval(averageDuration)) (\(printableStringForTimeInterval(totalDuration))) seconds")
     }
 
     // This function is for the use of XCTestCase only, but we must make it public or clients will get a link failure when using XCTest (23476006)

XCTest/XCTimeUtilities.swift

@@ -0,0 +1,34 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//
+//  XCTimeUtilities.swift
+//  Some simple functions for working with "time intervals".
+//
+
+#if os(Linux)
+    import Glibc
+#else
+    import Darwin
+#endif
+
+/// Returns the number of seconds since the reference time as a Double.
+internal func currentTimeIntervalSinceReferenceTime() -> Double {
+    var tv = timeval()
+    let currentTime = withUnsafeMutablePointer(&tv, { (t: UnsafeMutablePointer<timeval>) -> Double in
+        gettimeofday(t, nil)
+        return Double(t.memory.tv_sec) + Double(t.memory.tv_usec) / 1000000.0
+    })
+    return currentTime
+}
+
+/// Returns a string version of the given time interval rounded to no more than 3 decimal places.
+internal func printableStringForTimeInterval(timeInterval: Double) -> String {
+    return String(round(timeInterval * 1000.0) / 1000.0)
+}
+

build_script.py

@@ -78,7 +78,13 @@ def main():
     if not os.path.exists(build_dir):
         run("mkdir -p {}".format(build_dir))
 
-    sourceFiles = ["XCTest.swift", "XCTestCaseProvider.swift", "XCTestCase.swift", "XCTAssert.swift"]
+    sourceFiles = [
+                   "XCTest.swift",
+                   "XCTestCaseProvider.swift",
+                   "XCTestCase.swift",
+                   "XCTAssert.swift",
+                   "XCTimeUtilities.swift",
+                  ]
     sourcePaths = []
     for file in sourceFiles:
         sourcePaths.append("{0}/XCTest/{1}".format(os.path.dirname(os.path.abspath(__file__)), file))