Fixed up test

Author: David Ungar

Sources/SwiftDriver/Utilities/DateAdditions.swift

@@ -25,9 +25,9 @@ public extension Date {
  self = Date(timeIntervalSince1970: Double(secs) + Double(nanos) / 1e9)
  }
  var legacyDriverSecsAndNanos: [Int] {
- let totalNanos = timeIntervalSince1970
- let secs = Int( floor(totalNanos))
- let nanos = Int((totalNanos - floor(totalNanos)) * 1e9)
+ let totalSecs = timeIntervalSince1970
+ let secs = Int( floor(totalSecs))
+ let nanos = Int((totalSecs - floor(totalSecs)) * 1e9)
  return [secs, nanos]
  }
 }

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -132,6 +132,11 @@ final class IncrementalCompilationTests: XCTestCase {
  XCTAssertTrue(foundEdge)
  }
 
+ func testDateConversion() {
+ let sn = [0, 8000]
+ let d = try! Date(legacyDriverSecsAndNanos: sn)
+ XCTAssert(isCloseEnough(d.legacyDriverSecsAndNanos, sn))
+ }
  func testReadAndWriteBuildRecord() throws {
  let version = "Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)"
  let options = "abbbfbcaf36b93e58efaadd8271ff142"
@@ -142,24 +147,41 @@ final class IncrementalCompilationTests: XCTestCase {
  """
  version: "\(version)"
  options: "\(options)"
- build_time: [1570318779, 32358000]
+ build_time: [1570318779, 32357931]
  inputs:
  "\(file2)": !dirty [1570318778, 0]
  "\(main)": [1570083660, 0]
- "\(gazorp)": !private [0,0]
+ "\(gazorp)": !private [0, 0]
+
  """
  let buildRecord = try InputInfoMap(contents: inputString)
  XCTAssertEqual(buildRecord.swiftVersion, version)
  XCTAssertEqual(buildRecord.argsHash, options)
  XCTAssertEqual(buildRecord.inputInfos.count, 3)
+ XCTAssert(isCloseEnough(buildRecord.buildTime.legacyDriverSecsAndNanos,
+ [1570318779, 32357931]))
+
  XCTAssertEqual(try! buildRecord.inputInfos[VirtualPath(path: file2 )]!.status,
  .needsCascadingBuild)
+ XCTAssert(try! isCloseEnough(buildRecord.inputInfos[VirtualPath(path: file2 )]!
+ .previousModTime.legacyDriverSecsAndNanos,
+ [1570318778, 0]))
  XCTAssertEqual(try! buildRecord.inputInfos[VirtualPath(path: gazorp)]!.status,
  .needsNonCascadingBuild)
+ XCTAssertEqual(try! buildRecord.inputInfos[VirtualPath(path: gazorp)]!
+ .previousModTime.legacyDriverSecsAndNanos,
+ [0, 0])
  XCTAssertEqual(try! buildRecord.inputInfos[VirtualPath(path: main )]!.status,
  .upToDate)
+ XCTAssert(try! isCloseEnough( buildRecord.inputInfos[VirtualPath(path: main )]!
+ .previousModTime.legacyDriverSecsAndNanos,
+ [1570083660, 0]))
 
  let outputString = try buildRecord.encode()
  XCTAssertEqual(inputString, outputString)
  }
+ /// The date conversions are not exact
+ func isCloseEnough(_ a: [Int], _ b: [Int]) -> Bool {
+ a[0] == b[0] && abs(a[1] - b[1]) <= 100
+ }
 }